Version bump, add support for user patching (bug #503328).

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

9 files changed, 701 insertions, 22 deletions

diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index c22fc49c860f..5781e2232aea 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.434 2014/02/06 07:00:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.435 2014/03/10 19:08:30 radhermit Exp $
+
+*vim-core-7.4.193 (10 Mar 2014)
+
+  10 Mar 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.193.ebuild,
+  vim-core-9999.ebuild:
+  Version bump, add support for user patching (bug #503328).
 
 *vim-core-7.4.169 (06 Feb 2014)
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 4aad7287b38f..d433a08647c1 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -12,23 +12,25 @@ DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18
 DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
 DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f13c4a165770cef28bb76d8dc7aa630671 SHA512 0667810a1ae908f5739ab37b32688fff3d65c4f69e83d3f9d0364112e8e7f70c77eeae3d672725df25ad837a75e373619321c1f183e7ded67afad544fbdd7801 WHIRLPOOL 829ab6152daed43323af6537669d4c3d6367138d0858c746ba02a6fc15497ef7161c62ccbe9bac7526296f5adf52a4ba1fe86c3539dd559ddc5cb4f6e0f90cfe
 DIST vim-patches-7.4.169.patch.bz2 220499 SHA256 faf5e06098d45b25cea6ddb9e4ef080ce4717f2c2148678ded4f715bcb9fd652 SHA512 1102d7f89ad0cdd81f4bfa03875d400be3b642565527c61e72583b85723ef5f25ed7d7bc0dd6b620d013f65f500add84b96db734f45c21369e22405f6f6a6f8d WHIRLPOOL 1e45b776f85c941b3b741018338ece2b299576e5261103bc381e9b1f1162652bd79f119e060710dbabf99e3bff0668de9485df38b57897f716bd52a2f1f3cb2f
+DIST vim-patches-7.4.193.patch.bz2 252912 SHA256 9fbfa1758610a84315bb74c3e6d8224779fd5ef1fccb3acabc488d855966839a SHA512 d86d1bcc2dea13971772ff716dfd455c66d7e8df280c2a7293ec2d7baa10a0e184b4083044665db7b4a0a7c64bbcc0c3f20e43fd937dd712fb4cfd6ce9a0a5ab WHIRLPOOL 46203445b9d8b445f2be63262a60d7e48ddf922c5830326af84199760e8770b0b987974f4abb52d97099ddfabb6c0f93cb6647bfe5e0f94eed056bbb10aee3db
 DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
 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.155.ebuild 7307 SHA256 f89dbd66065f385dae357147ead51ea0d7f9f2437d8ea75a040285c2d53e4309 SHA512 a8ba3fce5317269464eeb1b3f47a61b3e14fc874b21cfcab857cebf4cf605d388cfcf02ff083dfcb83c78ec0853c1b1c34b97dcd24ed67972db70ba64354f76b WHIRLPOOL 9416d033012ade6b0a44dc065ca5a7618bae2c2c707b944402b91f18a2bc0b97783432897dea9ace8f128eb31d859daef00422105b6ac880acc686f503162ff2
 EBUILD vim-core-7.4.169.ebuild 7307 SHA256 2f663cdf189e17ab0daf9a272a2e4de384325b57cf1a4f19fa37a5955f04a7ba SHA512 9dd455129d269c58bf32a9cc913fea97645c2e32c1b0069d9b2e3413c87be197e3d6f1f17c83009026d35b3d0cddebe4bb2b209c10be8f1ecde2ef668e1b63e6 WHIRLPOOL 1b3af2c73f508475cbf06ebb81094e6051edddc39bb7dea85ad07f970ccb8d975e9f5db68a85a647c51465956c96f556606985b1c9bd547d49c0330543dcb2c6
+EBUILD vim-core-7.4.193.ebuild 7321 SHA256 2b846d3a1eba8651723d3084aae0730ebe2aa2db2e714ade4bc0d2ecf84a60ab SHA512 2501f4402427f0284a3a50abcbbdbaeeb4390735ad997f01597feb442ad041a16f7ebb83b6615487e978385fc62828e9c763410c13ccbd89313dd23984e523de WHIRLPOOL 1186ae48d1565c601fd7322c0bd644d2fa1d33211d0e25f2b27563698123dc585360421b98d38b1b1b13846db8d94745f98e7a9d69e99685814518e45d6c964a
 EBUILD vim-core-7.4.52.ebuild 7409 SHA256 31d591fcce20577af303ef2d7aef6f359a51e28e83880f22a5046245def77d60 SHA512 22b26ec530b9581b1c0617996630dc5f97485b6936ff749cf7459714a6bd077469e68cf334f5dcb412e4a33b2845e8fe260b209631ebc566c5a4c38529b1028a WHIRLPOOL 3fe3c8d1a7e14ff292866961900086f430b4b9eea77c0d69cb2ea03b32fb6c37bb1742a1cc1a10b06a097c613481b8766b587d781d710df2a85e01b04ef9fbc1
-EBUILD vim-core-9999.ebuild 7304 SHA256 aa42ad39ad777c97723197ea32ceb95099a8daf2c6525a134f930326e1bdc8a4 SHA512 2438938e2c9840e716385e2b227c23dd88daf49b37c41a4c08069ee0eeb0534b56790881d6f4bec93f5a12847a185814e7523d6eda53559ea266d52eca8597ac WHIRLPOOL e3ddab6b47a96c3e1118d404ab742c0f0c8578769b92bf4d376dfceac9a2b79d5b36a4354d38007a6c9e704ad3e4e87d99295aad9db5f7b394c74d0dce36e391
-MISC ChangeLog 58999 SHA256 2ed4c08fefc433e5a004ca2eb0dc7f3a07b845e4a6668368c83b7bb9ec6debc5 SHA512 2b93782dabb7b255163115ff8e37efe05e1a8f7f8dc3c5e278978ad94c9d8e794917ba94b14459608cd2a6a2e016d8b969f98a111a32c3ce0cc84ae6113b11e6 WHIRLPOOL 73187a96066e45b3b5e0fd263dde430e9bf9189fe9eb151d175020c4a918a8ca0681bdc9ceacf5db4f7d46857f4dd819e59f041061603ed181c39476d68050f8
+EBUILD vim-core-9999.ebuild 7318 SHA256 e57e5ece9aef1d086bfb991d1d70dfa1cda08890cb448b62ecf42316d126293b SHA512 9981ac7d565b4423947557bfb34749b5a0430771debe37a8ad28d91fb4d380c60fc4a4db65dc9b2e8b48dc622cf08d7364354a83d45fbc3f7ef2947c87d471d5 WHIRLPOOL b98f35062eba3b04b27aec78ea6bfd0bb322a8cc97b83c8820a5555203621ada3f3a3f1c11d72a1c7820821ac96971c65336b3731e4420d0a7d57281f58470b9
+MISC ChangeLog 59193 SHA256 1f3cebc931f0efe5e9f20a4e3cacfbec77918cdb687beb057a64d6caeeb28124 SHA512 d6e06001faa22fb48366aeb1d98d1813dce496f252a9e5e2a93462e1c78441cf2f392be0164762a7c02a8c374efe1c1ce01edc3e1a4beaa19bf7a7371d388f6c WHIRLPOOL 108ad6abeb57e94a608290a1c6e2d220ee5f796ccf3242f2b4776dcfc4fbe810212e3880b0ae80855938754741308835403ecd60f269afd32bd40fca184cee5e
 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS8zMiAAoJEEqz6FtPBkyjqbkH/1UuXwCOGsUyn2JrZzctY7hd
-+9QSHyVtazFejYUNBW/MaaQGCbtNS9DTDUBFKRhuq3MiEBbpbdWz9fqH83UnqNo4
-CPrmDe/etQ0Cso+y3CVCpW6nL4H+6MQTYuA1Zdag/ktaJZW67d4wB89ciHy0DcAE
-89J/aoVrlDARR86dCYv0j5j8oHUwygRfB6v8lvvRvyN1OlhxhlvAbPYRxqij8wvk
-FfFKASJwHYJYasRfMf9XTbEQBxFCIW+Jpr3Pd2LdM/Zxe8hVrszJiNlfTTf5xbQI
-xJAWWP9I3NyAHfZcoUWEU+MDpkntJJ3SmQppuerYmiSoOVcW+ZGATqXlxEfiRHg=
-=O1/r
+iQEcBAEBCAAGBQJTHg2xAAoJEEqz6FtPBkyjRu4H/AgdWHJwl/c4McH3xgnEY8b+
+Do6wosamHT6QGrPZS5gM4PWyMXRMbHt1leOeR2WmmP9B5vWBCQICkFVkuBXflouf
+yC29ghDjiLxjBH99uMlIDixIv3IrUpxT78lJRh2yXsTS6kV1dgEcEiDUJ6o3BZe4
+uE98yJLgMJ1gwdFi5XfRO5lkND2Onrz6cqiWuE8e/zeZ4pChGT3OX7b+ci0qKBSi
+sgVD3y/N27x+siLoXFWcFMzqA48ne3wHfg9wElHMtnj00ZCQUTrfHh3y99YiBB+X
+AQSWyP3AENCSlncFe7xUe0gPjBp9SL8xTBh5vOC2jjYf9/PoY13d1Hl8aXEFHfc=
+=mfKX
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/vim-core-7.4.193.ebuild b/app-editors/vim-core/vim-core-7.4.193.ebuild
new file mode 100644
index 000000000000..56f2e822d673
--- /dev/null
+++ b/app-editors/vim-core/vim-core-7.4.193.ebuild
@@ -0,0 +1,232 @@
+# 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.193.ebuild,v 1.1 2014/03/10 19:08:30 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-r4.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
+
+		if [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then
+			# Patches for vim-core only (runtime/*)
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/gentoo/patches-core/
+		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 01db7c08d3f4..23c41041d5b6 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.7 2014/02/06 07:00:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.8 2014/03/10 19:08:30 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -100,6 +100,8 @@ src_prepare() {
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
+
+	epatch_user
 }
 
 src_configure() {
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 4bf632f5031d..810db91c7080 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.453 2014/02/06 07:06:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.454 2014/03/10 19:10:16 radhermit Exp $
+
+*vim-7.4.193 (10 Mar 2014)
+
+  10 Mar 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.193.ebuild,
+  vim-9999.ebuild, +files/vim-7.4.193-fix-tests.patch:
+  Version bump, add support for user patching (bug #503328).
 
 *vim-7.4.169 (06 Feb 2014)
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 923edf837edb..0ed7e5296577 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX vim-7.1.285-darwin-x11link.patch 388 SHA256 0b935efbedabeab8439d42baa1d07b2f3d5e2964dea9e504ff2a4d4b9f3e6bcd SHA512 5fc5786abfc1258d29f3d37e89696dce8f4f770a889bebc4b287ee777cfb3e933025dfad015c9cd5984fcc355d06db4d95d45af768d2dfc5c76287a3ff5e04cf WHIRLPOOL b0e140078233ae10a944db92fc1268e9f73239ca045a89e5f4ed933859a97a075c20cfa3702b69eff807dfd0a10007c9051ccc272534438ebd7a504d359e1b29
 AUX vim-7.3-interix-link.patch 530 SHA256 6d72a9b4f1ebe3876c31d9424aead4ec5946fd8051966c34ec51043751007c76 SHA512 6b7809628b389465f628d240889a4b42a3057991e34a02089da302fc65e9677f30a12b1ca6866b6fe5c770c0e62baafbe174ade69c7f004d0372be1e2a17bbb5 WHIRLPOOL 9e2f5405685ee92c4fca0ffd4e23e6b37473e1e9b921fdd87e91c29073b11f896f2fb1ddb3a21b66f1a2ba299dff4069af4632807a4abfdedf712bc28ded7ce5
 AUX vim-7.3.1214-python3.patch 780 SHA256 9c128516c92f178c844a6cf8447f6feb4246903bda2f0fdb368e19f6d87cba4b SHA512 79460f95c4a181f78144e2749bdc388e60a6ff7bf3efec346a0e3cf741c128d093aac8533e8fa76120ce9016de4e27d5c9b0d1ed1d93fa77614191c1fcc59125 WHIRLPOOL 42f17388e5c373725146e0bcf75f7df61d03c089c8cefc53f39a3407c974c86a3e4676ef0a6546ebbc1f5be7f1be220b9d442a8e37964f1c7e80b6dffddcf42a
+AUX vim-7.4.193-fix-tests.patch 3303 SHA256 23824f70378c62aa17a26060d48c4df5015e0a9e38c4ecb767a4275731908d70 SHA512 da751f8971ee86e3b9f7332c0705fbb94386c1b2aa4e4aad5e4bfe071de754098e8e22e3fa1f82b1e6f9f533ee865d09a6054c6b914b29cd0172e0c07ec9a093 WHIRLPOOL 8e88282303f9248573dc1cb7d1166194eeea4e25dadc3909f1c926b9b69675760498e5b034f72b3cb9b89f6b95244989a2d5c8d6dc6e5139d95141f9d21ac2d6
 AUX vim-completion 998 SHA256 bdca6069ef0fa995718f4b59fea85e58629259bb5a385d53e52d162d1463d4ff SHA512 785c94562a5d1781f8033947d96f623e0672939fe5bd8b6598a2230f53801ce5c70d36c55712f8a8bdc4fa9b2c51799123ec1448ec6ff4e22f046494156239b9 WHIRLPOOL 3d45145ae27455157476ad5e1d69dc34342ad587b918485cc78a69568c06d47d897e39383f2fe96202a792cde4e60f8e0fd1581df68b1ec4200e87a69d58b06d
 DIST vim-7.3.tar.bz2 9080692 SHA256 5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d SHA512 5560351fb005aae0be435a59de0218a8b4f494c8211a026838e8735a98d5010c395b9da6ec8c1ea31c75a94da7c6071f3eb0b7e5426f5beb75cc0d56ddb8d5b2 WHIRLPOOL 4ae549b9c6dcac34a676fa27dc1fb51e925d874fba932817eed8aeff56ad94d2dc4314219a94876b70776263575e1577bd80fb60a019bbd784c96ed74a5df822
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
@@ -11,23 +12,25 @@ DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18
 DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
 DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f13c4a165770cef28bb76d8dc7aa630671 SHA512 0667810a1ae908f5739ab37b32688fff3d65c4f69e83d3f9d0364112e8e7f70c77eeae3d672725df25ad837a75e373619321c1f183e7ded67afad544fbdd7801 WHIRLPOOL 829ab6152daed43323af6537669d4c3d6367138d0858c746ba02a6fc15497ef7161c62ccbe9bac7526296f5adf52a4ba1fe86c3539dd559ddc5cb4f6e0f90cfe
 DIST vim-patches-7.4.169.patch.bz2 220499 SHA256 faf5e06098d45b25cea6ddb9e4ef080ce4717f2c2148678ded4f715bcb9fd652 SHA512 1102d7f89ad0cdd81f4bfa03875d400be3b642565527c61e72583b85723ef5f25ed7d7bc0dd6b620d013f65f500add84b96db734f45c21369e22405f6f6a6f8d WHIRLPOOL 1e45b776f85c941b3b741018338ece2b299576e5261103bc381e9b1f1162652bd79f119e060710dbabf99e3bff0668de9485df38b57897f716bd52a2f1f3cb2f
+DIST vim-patches-7.4.193.patch.bz2 252912 SHA256 9fbfa1758610a84315bb74c3e6d8224779fd5ef1fccb3acabc488d855966839a SHA512 d86d1bcc2dea13971772ff716dfd455c66d7e8df280c2a7293ec2d7baa10a0e184b4083044665db7b4a0a7c64bbcc0c3f20e43fd937dd712fb4cfd6ce9a0a5ab WHIRLPOOL 46203445b9d8b445f2be63262a60d7e48ddf922c5830326af84199760e8770b0b987974f4abb52d97099ddfabb6c0f93cb6647bfe5e0f94eed056bbb10aee3db
 DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
 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.155.ebuild 11525 SHA256 a5ff17318686529f80eca4b8814776f8ef36b5aae19e5591788a6d7418dba50a SHA512 3f6b113be76cb45343e46eae6fb81cf86a023412fc3c984c3446616868c8e387caa640027929bb3d26829d381f938f151d70fdfa7c884fc311781bd91be7531b WHIRLPOOL 7e547fb61f4b73d40151f130c0c5a2eae0075bf07133abb17264c288c1bf7f25df61000620eff26c79f6e91bf2fbe372a12d096ed5ea6dcc69a81b32d8509d22
 EBUILD vim-7.4.169.ebuild 11579 SHA256 48c9e8b3a8e5242cf7696c8289a0a594fb489bfe5458f56c01c2c4e201015f20 SHA512 1ec702e647f3477a925151095cf7353b6e4e58349b36f0b083ca27760c51046a7f4ca43db5c6d7d804c10742b4e58adb4fb257f7cc233f39cddcb32b3f2a7f15 WHIRLPOOL 012301ac84569bbbd8a40649beac0ef5900ce5e1d5a1425ad7884ff33e1ee2a059a7595b6a872e89518928d44f4f1457e39158436970d260a45bf07bbdbe0f80
+EBUILD vim-7.4.193.ebuild 11637 SHA256 ae6b91effb1a21a999423ba656d8c3c96e030019f707d68edf67a1534c0ed47d SHA512 c21fb746ade544776030e0c46c0fcc36eafc08aabcd2ce865672600cb55f082015bff079926da9d0db514451804ae12bf9cfc3fcc267a756f8a5360d92739cc0 WHIRLPOOL dd576baf17306bb79e59c2be9cdc3e7105fccdd4eba19fc00c99564609229158670c2e03477eabc617ccf1215bac9abfa920024b9ba4dcce151397569065dfd2
 EBUILD vim-7.4.52.ebuild 11778 SHA256 6c966f4d425286610619b546ea787222b4fdcdb619eefc017cc041c7eac16db9 SHA512 a4f7af2a712f6ac7f254b62597a25ce3b4e269d575531eae85df9d34fdb5315ccba8c1b5946d4eff210d3acc82781040f7309a176b79f25eb6886bf94bf0fe77 WHIRLPOOL c1e4bfa5d5ae42f9df88a237903190d7658eaaaaf37b05c5b4addbc56c3064556ba630e923a1b3037f5f7800b35287ce6b2cc2bd800099e079094b820e749545
-EBUILD vim-9999.ebuild 11577 SHA256 95ed1c4c7d7597bc4670de225c2e275b939a216d9b8d5ed2a6d401f1e7f25fcb SHA512 05bac9cd70470570bdb901379b8ee7774290962a2937c3e6b97ad055acffafe693f3dc8fb6aceb7b40965e5556c690184d7a189a5b62de09a0903a995b17d2e6 WHIRLPOOL e13f5581d6ebf9aea36a39557478efd8f95eb4783c114aed5c8383787ffe703a2779e71d70a469176d1f483ac5852aa200ecc12f030c7ac303805f9191a097cd
-MISC ChangeLog 61235 SHA256 f2d63f88d27f97f8a3bf39d907b6eba3a3f42338aa8321b6a0501574c497ae14 SHA512 597b482758833f075360f30ab7a2cad99002536a23e19151c140ed8631945558b2be285048ddc8c5435cc87153ae947bb2d0c3d60073ce7d0695220b69961bbc WHIRLPOOL 15757cc8a4ca2813cf38753d699679ca9730baaadd0c7641bb9897dd9e00fcaeb0cb0e399ec1699a2558cf59d941a1a62710f73d198badb33bf26d43a983dfea
+EBUILD vim-9999.ebuild 11591 SHA256 369c694083ce69563415e2c64f5fa8cfe4a8cb1723b10cf349cca73f7c7ed1c9 SHA512 272822fd7f98c4b5659e83088604daba74a70bd290b1deafd554ef6f99a78ce931ed5d2166863c9a9e927c7583d6851fc24be11ecfa130c4801c91d89f5548a3 WHIRLPOOL e46e1a2c916538da99fa73aee89fba33a2f2cf32c0e3b4471dc98b889cc6a67f7a4bbbcdd4fc0c6fdbc1ca0e0e3c602f028ac8a3dc6e413e37a58f3da1a02648
+MISC ChangeLog 61450 SHA256 2cc7b261db2e84e704cfb9268483e2ab1eba1d340aa2343f764867436d7e7a21 SHA512 54d5a5eadce58c8992396c6c2785dfb66042d3ec056391c78e07142fd787b1e33ba111a458d4f792a5c617f1ce80cb12b8c304fafcfe676eec04693bdbb36010 WHIRLPOOL b757467d1bba8df6a3bce9e23a427e1262fc35d21ca5520c0b167732c0cd47426b529904c6e20952134f1aec8139d62868c89a5a1895bffb719cb5ebe039cf0b
 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS8zRhAAoJEEqz6FtPBkyj27cH/3Y4/eP7DhyouxH66niDwK/f
-9Da/0jcQ6d7x/DRHLim0YBviOq2JwPI3EELTe+1GxYk9kCg7zcAV6vfXUkBPujFM
-l1/6aaLTYJd3ICXqmG+WKiTCl0nZmF24GBsFw7TIzmD50ppV8WHymBmidiegnraF
-/3H7+7393DfQZ6uCY9DL8m0oLSiDCg9CLXoWwLBHpiWCYb89QsRlmCnJjpsJigyL
-E3DHKuKCmqGeV55PbpoukklplN9CapHoMdtxfG8gKIwCIwAnJ/9KLXk32FNGyanL
-YcVgF6UXWDZQDWJ9cdbGW1iHU5KmgE9ReQTg5t1JPCVP3L2O6Ozhpsb6g7+kQnk=
-=l1wP
+iQEcBAEBCAAGBQJTHg4aAAoJEEqz6FtPBkyj4hwIALKOke4cu18e4aXsdiQrBqY3
+GkhE6r5Og/Y0JbHUaflmZ8lnfQkhPw9L+ZhfTs5oSr893thO/Wke8LyZc4OiBoh2
+UHT7dDA58wll/Z8MXYV6xdv87fjhrUvTaLtXsm2PpNRb+J30dMnaO+7+L7a8z1bx
+1ieqHwQroSVEkHpEIVyGDOnggIJqUK1axmX4vtHSNYLJK2KelrtuSoayVuv/1KoA
+GcQCcoSLwklmK+vCRBmulLqSRZXUMBoypPzhQYDIua2haxo6zBPae34Fb1cfP2hi
+Efc3qdy/7EYLRklvVNc+/7NA32rqdlQkuTJsg0JtZb5mto814DO53P7Sw4k6Cak=
+=3aIu
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim/files/vim-7.4.193-fix-tests.patch b/app-editors/vim/files/vim-7.4.193-fix-tests.patch
new file mode 100644
index 000000000000..9159aa569f7c
--- /dev/null
+++ b/app-editors/vim/files/vim-7.4.193-fix-tests.patch
@@ -0,0 +1,54 @@
+--- a/src/testdir/test86.ok
++++ b/src/testdir/test86.ok
+@@ -882,11 +882,11 @@
+ l[:] = FailingIter():NotImplementedError:('iter',)
+ l[:] = FailingIterNext():NotImplementedError:('next',)
+ <<< Finished
+-nel[1:10:2]  = "abcK":ValueError:('attempt to assign sequence of size greater then 2 to extended slice',)
++nel[1:10:2]  = "abcK":ValueError:('attempt to assign sequence of size greater than 2 to extended slice',)
+ ('a', 'b', 'c', 'O')
+ nel[1:10:2]  = "a":ValueError:('attempt to assign sequence of size 1 to extended slice of size 2',)
+ ('a', 'b', 'c', 'O')
+-nel[1:1:-1]  = "a":ValueError:('attempt to assign sequence of size greater then 0 to extended slice',)
++nel[1:1:-1]  = "a":ValueError:('attempt to assign sequence of size greater than 0 to extended slice',)
+ ('a', 'b', 'c', 'O')
+ nel[:] = FailingIterNextN(2):NotImplementedError:('next N',)
+ ('a', 'b', 'c', 'O')
+@@ -1233,8 +1233,8 @@
+ >>> Testing NumberToLong using vim.buffers[%s]
+ vim.buffers[[]]:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)
+ vim.buffers[None]:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)
+-vim.buffers[-1]:ValueError:('number must be greater then zero',)
+-vim.buffers[0]:ValueError:('number must be greater then zero',)
++vim.buffers[-1]:ValueError:('number must be greater than zero',)
++vim.buffers[0]:ValueError:('number must be greater than zero',)
+ <<< Finished
+ > Current
+ >> CurrentGetattr
+--- a/src/testdir/test87.ok
++++ b/src/testdir/test87.ok
+@@ -882,11 +882,11 @@
+ l[:] = FailingIter():(<class 'NotImplementedError'>, NotImplementedError('iter',))
+ l[:] = FailingIterNext():(<class 'NotImplementedError'>, NotImplementedError('next',))
+ <<< Finished
+-nel[1:10:2]  = "abcK":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater then 2 to extended slice',))
++nel[1:10:2]  = "abcK":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater than 2 to extended slice',))
+ (b'a', b'b', b'c', b'O')
+ nel[1:10:2]  = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size 1 to extended slice of size 2',))
+ (b'a', b'b', b'c', b'O')
+-nel[1:1:-1]  = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater then 0 to extended slice',))
++nel[1:1:-1]  = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater than 0 to extended slice',))
+ (b'a', b'b', b'c', b'O')
+ nel[:] = FailingIterNextN(2):(<class 'NotImplementedError'>, NotImplementedError('next N',))
+ (b'a', b'b', b'c', b'O')
+@@ -1233,8 +1233,8 @@
+ >>> Testing NumberToLong using vim.buffers[%s]
+ vim.buffers[[]]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',))
+ vim.buffers[None]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',))
+-vim.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater then zero',))
+-vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater then zero',))
++vim.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
++vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
+ <<< Finished
+ > Current
+ >> CurrentGetattr
diff --git a/app-editors/vim/vim-7.4.193.ebuild b/app-editors/vim/vim-7.4.193.ebuild
new file mode 100644
index 000000000000..00edee946d5c
--- /dev/null
+++ b/app-editors/vim/vim-7.4.193.ebuild
@@ -0,0 +1,372 @@
+# 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.193.ebuild,v 1.1 2014/03/10 19:10:16 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, 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 dev-lang/ruby:1.8 ) )
+	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
+	fi
+
+	epatch "${FILESDIR}"/${P}-fix-tests.patch
+
+	# 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
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index 87b0c84dc574..aab814da05a6 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-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/vim-9999.ebuild,v 1.10 2014/02/06 07:06:07 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.11 2014/03/10 19:10:16 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -140,6 +140,8 @@ src_prepare() {
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
+
+	epatch_user
 }
 
 src_configure() {