Version bump. Add racket use flag (bug #350887) and selinux use flag (bug #490270).

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

10 files changed, 838 insertions, 84 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 6937446c91b8..56be3e575cbd 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/gvim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.415 2013/10/15 23:16:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.416 2013/11/19 10:28:43 radhermit Exp $
+
+*gvim-7.4.94 (19 Nov 2013)
+
+  19 Nov 2013; Tim Harder <radhermit@gentoo.org> +gvim-7.4.94.ebuild,
+  gvim-9999.ebuild, metadata.xml:
+  Version bump. Add racket use flag (bug #350887) and selinux use flag (bug
+  #490270).
 
 *gvim-7.4.52 (15 Oct 2013)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 6edb2fd1dfc2..97d9cd602537 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -16,22 +16,24 @@ DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c0
 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 gvim-7.3.1214.ebuild 1067 SHA256 d005488811ca107f47fcc78d63d4bc7fcfd17232eaa8f43a553fbe4e14c81b5d SHA512 a0e321432369a986810cd7ac1201247e42c1693331de7e4de234f204b7b943ef8e9cc689bde0122082a984583ce9c36ec5ecf1136df3a8fb451493fde8cef484 WHIRLPOOL 2a3a10f491937a96980f6207c1309ab3df46336d589b812ab2e1748698f19194e7fe44eca07b21f0f88b0297e742372f7eba1337d40add870929b2ee860ab783
 EBUILD gvim-7.3.762.ebuild 958 SHA256 19a7ce0d8ad24047c022c866046ec63aab92efa911e87dea3d83f7e4b33e7dd9 SHA512 3966bd3a5cb514f99cc3ee5718b09a3fcb8eaf2e71c118a255a3ffc496b64d116a5321719a3773d38743b9552408bc2655373753a9e1b8e5f571d848226253e3 WHIRLPOOL 8095463dd1ed4bbace9ef0fbb9a2ce74fc49f1c1f431fc9ce83e8eed4d23c97f1eb54e90575baaa77b928eacf659322076256e511b045896b94e1ec5479fe5ce
 EBUILD gvim-7.4.22.ebuild 12598 SHA256 04f24e7d19c1d8711f6726d7a74f42092de4fc21921bc551b6e8cb7aceff6a3f SHA512 010b40a6dad617f99473c8fb4d95f255b1fd686aee314d764398dcd91e643975438179221a21980664f8f5c3e5fdf86ac9739d90f0dc995f011c5b5ddaae8ae1 WHIRLPOOL aea1f019cb0361d0da575afb1e94b16837a2034dc3389abb52ba0aef2f6a26a2e8c8157f21e6a4500b3bd977d21adc03d80b95f51b35c43e88c008199f942236
 EBUILD gvim-7.4.41.ebuild 12598 SHA256 dbeb49769bc5382ff5b8746dafd0be6526c675e2555d1e878ee121f67b5f5f59 SHA512 e233b0118b549e1e9a7fdc96af616d5a60f684a8126698e14a2d5762bedd264795f2ee48c2cc0763503bf493252c7a17f81842547b13a0dde82c2c2e2d134cd3 WHIRLPOOL e10e419ca131a00c3a7dd3cca665f1935719b23c094ffa56f6a92dc9d8ff2fd31ce08e714435e1c3017a0bb391df14925a18a247bcc0bacb19a94e5f697613d4
 EBUILD gvim-7.4.52.ebuild 12657 SHA256 d9cc1bbf5d1b8498b36a9463ca0425a1542bdc6556ae5b258fa17d50054ab3f0 SHA512 582066f1f66644503db422ab791b4c032cdd7a5f21afc63f5706eccadc367df9af237ecfef36f587b3c06fd9cf0a26e5062b2b22d210dc8376032c95bfb6e953 WHIRLPOOL 7353fe852fa227dadd406cb9bd6eed315065ff781cca11d68ce1157cd7fe1917ec524e82587fe5f6b71ba234c048856f0423591d05d6349f15f1f602132e854e
-EBUILD gvim-9999.ebuild 12655 SHA256 121425680c6d61c5e5f04d320b6127125a90c575d87948301760bd6414424f7e SHA512 0c204f372fc6e54d3d882dd4a7bd2b47308a19fe6597ec9954c9236b56c00aa59a26ba8aeecbb86c30cbbf258583471e2f3465fb18a996a4efae4db5289731b5 WHIRLPOOL ff5a2e963a1f12be2b807053377ced6fc8adf8f87dd9ba47d57176b64c1c9a8fa10942456cb279ec66b8a8de387da4053f1dc725afeb322388defa33aa06f6e2
-MISC ChangeLog 56629 SHA256 298aeba06f3e8e86cae2b77ec89c4a634574173c6c3cad46a761bcd686bfc9db SHA512 b93ff51fce67f0c18a0c389abeacff548cf80ea03f0166cb57856ab2288229f6864df58a67a771558e42bfac18149cf907de640270ec6aa3c0fa9a78d010ba8c WHIRLPOOL b5f0a5830b11df66be6a415d9b47c95a72bceb4d719ec53d6d9ec0174d6a2d2f6cadd5ae6ae77105c26bbbe6abf9e54198721e11f08af023d6f24951d67b8e34
-MISC metadata.xml 348 SHA256 e84bf1fdb970b616d6b2fb17caf3d3f75c276e52430c58e447f8a4dbbfd60777 SHA512 619abbfed97c2bf11f32ea519ba3f0a4a7c388723e6e60fc435fef7487fec143d4f9d492281fda9fd5b2f319afc3d89a7bc21aef962038296e0e13a23ce7229d WHIRLPOOL 0d72852f58d2a0682266ab99a5582112bd95588f781db5bec3d319d5cf1e9b54ff583a622047f5cf23f4165a83b591511cef01f510314710d798d8c688de1e98
+EBUILD gvim-7.4.94.ebuild 12197 SHA256 1225ee64245baa6a93740cdd9e7b78654dbdbf5bb3ae2eaccc1d73c7293938e5 SHA512 c4d48591ce86723eabab74c46ad43fbbaeeec61f82cd5ee9a77ddd268d0d4ba537bb0c9ad50440be387e7cf72f9d2912b20c6e3ea0e6f584f72932de3d374991 WHIRLPOOL 07e09d860fa7cde4066e7d8b37caf4a75efdde9ac8a62426f05da133dd2bef7c4472ae0ba8ee16a942c028fca2507bbe5ea291634e9380b6929e2cad590483bb
+EBUILD gvim-9999.ebuild 12196 SHA256 7037d31d8430ca25cbfcdcb7f5312ffbab211c210eadb493c2dabe37fca8127d SHA512 18ce57016ee02e3893b4017851a3db1482d448742c99dbcf3637eeb37615fa764e34b46638dd6f7809e531f42db64a61fd27c722d7033960ca32a6cba684881b WHIRLPOOL 403d6da62a7dd79251d3a1df208f77bc93dc0e04e32b205d7ca782c24aeed03dbf13830bf2f46e0125e426fc00f1fa304a91449f562b6a772dd99d3bfa9eeb05
+MISC ChangeLog 56850 SHA256 93d52c8d5021078ee23c04328bdaac63bc778ca0121f0af16f76a314f11b721c SHA512 2600dbdb69be2d250d33effd67f455821135a00dd3e94d0e66898401b1c82570898324d40997c650164361a6e46acfae044ccc634d7aebeb02184d8e2124c60d WHIRLPOOL 5fdfaf56f50237db554ae9aac713ecd15128bd9214745b00c2f334710702dd668297c7299b31fcb78f8047cdabe8e1d3756d7ff9ed0266497ee011573910698f
+MISC metadata.xml 436 SHA256 65897000698e92fafe106664d0575225d30d9b53d99cc6e700dacfff9669c4ef SHA512 e6f9c61ff5617d95d531d20251a291f427b180fb3d5a034e770ef6a7a3e59317d1e8848763d090ce0db0f8216bf15cb541608076a2aec2e0719fc646f6ab8467 WHIRLPOOL 32c61af86a24117276429c2a932e5c479f4eae02233d156ac214ff3592e46c30866dd4c72f8e7e688c03005e29eb80f60b56d499c6f59239fd195101b1c4cc1d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSXczoAAoJEEqz6FtPBkyjg1UH/A5WoTtdw+MYiXUok4S5Rguk
-rxOQOIGXhtoQlww7s8gWg3fs+Zm5ZNb1JJupNgkKsd9R5NkSQGKTykqMwbYdLLq9
-WU2kq/FCdZeC6yoMoHMclZHxArvWQ8YPFqoPKqUdW/qud5VFRN36T0NPLHz1f3g8
-4FcgSgHPOU1LgYIHk4h0T5C3MBdlyNGVKcuCeufyP35afmz+xnY6OiAAmraOrlyj
-7rMB6meslQ3pekzr4eEYA/3sW6Oh23o+aDaoGaOdU6ZeohoxiUkBcivxX/vbum0O
-MJyu4QpBSJzZV//AmOb5d3rOesPe7dhZrt+Yf/dEu7u/9KtYh0kkBlIk9UenslU=
-=1xLe
+iQEcBAEBCAAGBQJSiz1cAAoJEEqz6FtPBkyj8G4H/1Or0FhwDLdAU56gYteSG0ft
+d6TvvedJ1Hb1WuXXDF/i14puaXwYK0Gh22pngB+t7aFzEyITw0D93R/Jp9dYZeV7
+UahhFrv2cwUmQ91zeuS6L7jZwxhs6KrxczqzldAlCCoLu57mdK6ps80GNM1Bbv7F
+pi5pWRsKH56FVCea3ZgSmwwH3Kan0szPnj/lVT3MxzDmPF73sRqHo73QU8zDv+jE
+Sv9vSI7EDk4BjKWg8d+gg9LveTSsQzJM8ewZCJhYxJWcMnhdMmq60i4XRVJdro8m
+KyFlrp9B6EK3OFq2/rpzLXhajjB2QTnkXGvjaBb+RLE+pnp7ydSGa+5lwr8zPOk=
+=ph2O
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.94.ebuild b/app-editors/gvim/gvim-7.4.94.ebuild
new file mode 100644
index 000000000000..0eadd4a23d73
--- /dev/null
+++ b/app-editors/gvim/gvim-7.4.94.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.94.ebuild,v 1.1 2013/11/19 10:28:43 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 prefix 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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux tcl"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="~app-editors/vim-core-${PV}
+	>=app-admin/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2
+	x11-libs/libXext
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk? (
+			>=x11-libs/gtk+-2.6:2
+			x11-libs/libXft
+			gnome? ( >=gnome-base/libgnomeui-2.6 )
+		)
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				neXt? ( x11-libs/neXtaw )
+				!neXt? ( x11-libs/libXaw )
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit )
+		!luajit? ( dev-lang/lua )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-vi-1.1
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	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"
+
+	# 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
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf="--with-features=huge --disable-gpm --enable-multibyte"
+	myconf+=" $(use_enable acl)"
+	myconf+=" $(use_enable cscope)"
+	myconf+=" $(use_enable lua luainterp)"
+	myconf+=" $(use_with luajit)"
+	myconf+=" $(use_enable netbeans)"
+	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 -e '/# define FEAT_CSCOPE/d' src/feature.h || \
+			die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk gnome               GNOME2
+	# -aqua gtk -gnome              GTK2
+	# -aqua -gtk  motif             MOTIF
+	# -aqua -gtk -motif neXt        NEXTAW
+	# -aqua -gtk -motif -neXt       ATHENA
+	echo ; echo
+	if use aqua ; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=" --enable-darwin --enable-gui=carbon"
+	elif use gtk ; then
+		myconf+=" --enable-gtk2-check"
+		if use gnome ; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=" --enable-gui=gnome2"
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=" --enable-gui=gtk2"
+		fi
+	elif use motif ; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=" --enable-gui=motif"
+	elif use neXt ; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=" --enable-gui=nextaw"
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=" --enable-gui=athena"
+	fi
+	echo ; echo
+
+	# 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"
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim --with-x \
+		${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
+
+	# Make gvim not try to connect to X. See :help gui-x11-start
+	# in vim for how this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../testvim 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/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	insinto /usr/share/applications
+	newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	insinto /usr/share/pixmaps
+	doins "${FILESDIR}"/gvim.xpm
+
+	# bash completion script, bug #79018.
+	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
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		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
+	fi
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index ad6779e4e657..e35f0b30e670 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.9 2013/10/15 23:16:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.10 2013/11/19 10:28:43 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.vim.org/"
 
 SLOT="0"
 LICENSE="vim"
-IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python ruby tcl"
+IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux tcl"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="~app-editors/vim-core-${PV}
@@ -55,7 +55,9 @@ RDEPEND="~app-editors/vim-core-${PV}
 	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl )
 	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
+	selinux? ( sys-libs/libselinux )
 	tcl? ( dev-lang/tcl )"
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-vi-1.1
@@ -84,21 +86,12 @@ src_prepare() {
 			# 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"
 
-	# 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
@@ -174,8 +167,15 @@ src_configure() {
 	myconf="--with-features=huge --disable-gpm --enable-multibyte"
 	myconf+=" $(use_enable acl)"
 	myconf+=" $(use_enable cscope)"
+	myconf+=" $(use_enable lua luainterp)"
+	myconf+=" $(use_with luajit)"
+	myconf+=" $(use_enable netbeans)"
 	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
@@ -189,12 +189,6 @@ src_configure() {
 		myconf+=" --disable-pythoninterp --disable-python3interp"
 	fi
 
-	# 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
@@ -250,12 +244,6 @@ src_configure() {
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		--with-vim-name=gvim --with-x \
-		--disable-selinux \
-		$(use_enable lua luainterp) \
-		$(use_with luajit) \
-		$(use_enable netbeans) \
-		$(use_enable ruby rubyinterp) \
-		$(use_enable tcl tclinterp) \
 		${myconf}
 }
 
@@ -388,9 +376,6 @@ pkg_postinst() {
 		echo
 	fi
 
-	echo
-	einfo "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
-
 	# Make convenience symlinks
 	update_vim_symlinks
 }
diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
index fa11381c9d5c..fe574ff96b66 100644
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@@ -5,5 +5,6 @@
 <use>
   <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
   <flag name="netbeans">Include netbeans external editor integration support</flag>
+  <flag name="racket">Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index c3687d105554..6ccc21424804 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,13 @@
 # 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.447 2013/10/15 23:15:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.448 2013/11/19 10:25:01 radhermit Exp $
+
+*vim-7.4.94 (19 Nov 2013)
+
+  19 Nov 2013; Tim Harder <radhermit@gentoo.org> +vim-7.4.94.ebuild,
+  vim-9999.ebuild, metadata.xml:
+  Version bump. Add racket use flag (bug #350887) and selinux use flag (bug
+  #490270).
 
 *vim-7.4.52 (15 Oct 2013)
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 5faae5defc2f..a319f43cbe2a 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -13,22 +13,24 @@ DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c0
 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-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 11685 SHA256 4e146f3f1543790176d4a4599c8cc5131424a381ce5e09708122932f439d067d SHA512 5e174be65ff70bde818a6d9b10fb721eb93d4c7a66f9b34acd77c260ca076960c3e999abcdee7ef1077756f97b7ef7bc1ee52a01da695ea6650b03d6a85bada4 WHIRLPOOL f556596dd8c4311496d6d444f3695e460e9c48b299ed7a0d9bb7ae7acd3b7f5852a85beaa0ef25da9d26c6c7df3cfb6622c103bd7e2ace9fbe5283da1b3f950d
 EBUILD vim-7.4.41.ebuild 11685 SHA256 3977ee1e5cbbae717bca43b0c9f216576122189563accdd229fc7c7df915d894 SHA512 32fae016d1e17147adb762479feefc83df0ab398f5e18c20ab5a2a9ef6af84d7176a27ec8da305bcc57290dd2a1236ae21be71f1b5fab208b842c23d1745b2c5 WHIRLPOOL b07ed4e458db3fa01e3146c8f0b5fbeb01329a212124772080ddd44c8d97694dd219018d4c6c95dd178efa24df25b88d9ca6e816d30239b69ea03104a391825f
 EBUILD vim-7.4.52.ebuild 11778 SHA256 6c966f4d425286610619b546ea787222b4fdcdb619eefc017cc041c7eac16db9 SHA512 a4f7af2a712f6ac7f254b62597a25ce3b4e269d575531eae85df9d34fdb5315ccba8c1b5946d4eff210d3acc82781040f7309a176b79f25eb6886bf94bf0fe77 WHIRLPOOL c1e4bfa5d5ae42f9df88a237903190d7658eaaaaf37b05c5b4addbc56c3064556ba630e923a1b3037f5f7800b35287ce6b2cc2bd800099e079094b820e749545
-EBUILD vim-9999.ebuild 11776 SHA256 dd279d6aac979c8a30aec69a6e78fc13bb7737c3d6c6ccc9896f327e375bcbbe SHA512 ef2c432e6233a93079e605df61ffc6dd8226726e83f80c7e5542fa16b414a4d9b98574a838a1e0fb73865657266613318efb8f89cb8440bbedf474ab1a6b1deb WHIRLPOOL 8553d680e9919fca6a0d9e9d68f4c4b3bbbd8375abc7938c0c3ef3ddcb52b68de52e3b961009f73829a5cd5eb33c5961423f96d930462503806495e473affcb8
-MISC ChangeLog 60218 SHA256 2097700f3c6633e568ee382bb4f519b783ecb058a8919f1e780d0d48910a9d2b SHA512 9549cd06337a150b056f087bd096beae063554698c958fe186a2ad4d3192adbba2e9c852f9f4a4b02263179260fbd75e73a5b5da4db721c286e8cb7017a27ce7 WHIRLPOOL 84d59c57a27da6a6dbc26834650de6165fbebad44a1e4240dca08af1d788273db4e00f6c0a51694c5bb9cdec50cd36f7ef0e984a50b911f79a90fcfe7d0032a7
-MISC metadata.xml 523 SHA256 b75a53f2927616d5ceb6fdef13bc77f5852e80d4dd0305c52c80c3b6999ba83b SHA512 a649323d51eac150924004665e99a2c99b2900524773a3a6a15e3fef7b856f6c6c2d0efd8e2213e202eb66a28432a171dd62346be045faa884e72a1a78ce8338 WHIRLPOOL b99bc6b2bd37665a8629f647b528473734bddd7f639e66e8213da75452822e3177273b23ef5be2b76a28e46216ce42b398d3d4529dc724e95049477f920dcd70
+EBUILD vim-7.4.94.ebuild 11579 SHA256 12fcf887c75572ad03c79e96d4dc46bc665897bcf5905b565040648e140fdd9c SHA512 bb415b9930623855e03a2f2a355dc4034a1e55ff50efa8aaadffdc0fbfef15ee887bd6a9254d4160abd9b6622feb0db12c979e24da16eedb2276c3702438f190 WHIRLPOOL 68e29a5037699fa63798fcc9570bd07ffdd12e3288f4bdb6a50c2454af80c14b220f36b88808151dee3dfb236e97343617dc5352805c7eca17c8dc600ebea492
+EBUILD vim-9999.ebuild 11577 SHA256 134273ff0c3cddcd45c6a54d952ef5add8b2a8e3b2c396b0e9085ca2ab343195 SHA512 ee6ffbc0e17e9da47887edd37f7be71354ea45874864211e47be625d0ad067142d54d7adbc7b61af9196f947b55d3b595932d626636e3ec6d4679b69d66f447a WHIRLPOOL 7906bd1098013979ca9edba640451a3295cc77022cfd30b371740793500fb84b3ce0e4c32815d74ff7d64d34832a24a751e852e86a207c00db08bb0a0d673af1
+MISC ChangeLog 60436 SHA256 5f8a8a404b5e87da78d4af19ea4ecbf72112db76e327af69957ed495598ab709 SHA512 617c17a5c121991c8cf1bf71a01152b8a49bcf40dfdb6acaf008364f5447bfb936f863ca9d62a33e8c2650bb02f61ad9e8956f28ddfe1f2a89335228e406355f WHIRLPOOL 8c0d6cf515154f6c3942ac2445a824c33f32e1d997efb19a6330de00ac863a1700a4802cb3a3e1b1f150c8dd05699305335ca9c7759caf38b21d10c3739c2169
+MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSXcyaAAoJEEqz6FtPBkyjahsIAKc8LDZzn3JJRjTpIG/VuB/W
-VLTr2LeY1ZSorBVXT2Pytqzdv9L7cYcDGam/80ALALPt7K+7LLSdecUZFPHBuVA6
-MsA3u+P5lA8iFu5QyZoWO1n9sIkiwqi8vIpQaRY57Kz4mNwt0qHcE0nqZw2YM0Ng
-hCV69AdD4CK6BfZGT4Iv8BtUwFd6Vv2CqYsEiac7gvO3humqF3krI3eG+akZYB4b
-pSvF2GPkXC9su8Lo+rMdBZwM8dG2aMsIGotFLsPzZ45yAOlXpj9EWq4lA5HMNhnz
-j1U8Yw5x07m1L+Dw2u60aRwpsfbCVvM8OmuhsMdC6zgUhNGXYpUQnCGWibDfYz8=
-=DInd
+iQEcBAEBCAAGBQJSizx/AAoJEEqz6FtPBkyjAWUH/3yHeg9z7Zi1Wbj80IGjFuOE
+JNHxqkv1jCEsYQSw9Gc5zZsYaaEab8akBr1PNVw/NcJ3vMZxgOMznKUzs+xe1Ork
+yr503CBbQRg7pN9dp2aPwUi1mxuAu2csSyMd4uI/Ku+Pkyzblmuml3FTNvCcXaJX
+CN871/v1oqa/js2mXiUu78EqGUfTJtfaQ32YRKtfUnfhLOwd5JW74xNZvZptKNro
+ltjqzR1uKPxZKKu9jWb/RpZVscbQs/yU/B7O5v01JOR+q11zClTOIYcE6nVxJFb3
+15YWK5Ju4rJLLGsaRbOZUBEmkIFERdK9rRn+TaoxhKOynw4mDHQkLTFyUJ80z2I=
+=tDFb
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
index 0420ff0cb997..205e3d216149 100644
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@@ -4,6 +4,7 @@
 <herd>vim</herd>
 <use>
   <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+  <flag name="racket">Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
   <flag name="vim-pager">Install vimpager and vimmanpager links</flag>
   <flag name="X">Link console vim against X11 libraries to enable title and
 	  clipboard features in xterm</flag>
diff --git a/app-editors/vim/vim-7.4.94.ebuild b/app-editors/vim/vim-7.4.94.ebuild
new file mode 100644
index 000000000000..c5e5c09f13d5
--- /dev/null
+++ b/app-editors/vim/vim-7.4.94.ebuild
@@ -0,0 +1,364 @@
+# 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.94.ebuild,v 1.1 2013/11/19 10:25:01 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} )"
+
+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} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( 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
+
+	# 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 -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-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 -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} \
+		${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
+}
+
+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 ee789e11f0de..138e3168a047 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.7 2013/10/15 23:15:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.8 2013/11/19 10:25:01 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.vim.org/"
 
 SLOT="0"
 LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python ruby tcl vim-pager"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=app-admin/eselect-vi-1.1
@@ -44,7 +44,9 @@ RDEPEND=">=app-admin/eselect-vi-1.1
 	)
 	perl? ( dev-lang/perl )
 	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
 	ruby? ( || ( 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}
@@ -79,9 +81,6 @@ src_prepare() {
 	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
@@ -176,7 +175,9 @@ src_configure() {
 			--disable-luainterp \
 			--disable-perlinterp \
 			--disable-pythoninterp \
+			--disable-mzschemeinterp \
 			--disable-rubyinterp \
+			--disable-selinux \
 			--disable-tclinterp \
 			--disable-gpm"
 	else
@@ -186,8 +187,14 @@ src_configure() {
 		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
@@ -201,17 +208,6 @@ src_configure() {
 			myconf+=" --disable-pythoninterp --disable-python3interp"
 		fi
 
-		myconf+=" $(use_enable lua luainterp)"
-		myconf+=" $(use_with luajit)"
-		myconf+=" $(use_enable ruby rubyinterp)"
-		myconf+=" $(use_enable tcl tclinterp)"
-
-		# 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
@@ -232,7 +228,6 @@ src_configure() {
 
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
-		--disable-selinux \
 		${myconf}
 }
 
@@ -336,27 +331,25 @@ pkg_postinst() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
-	if use X ; then
+	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 "The 'X' USE flag enables vim <-> X communication, like"
-		elog "updating the xterm titlebar. It does not install a GUI."
+		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
-	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