Version bump.

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

4 files changed, 425 insertions, 18 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 3037052726b3..0b590a7b5db2 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gvim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.440 2014/10/12 09:01:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.441 2014/10/13 21:11:06 radhermit Exp $
+
+*gvim-7.4.475 (13 Oct 2014)
+
+  13 Oct 2014; Tim Harder <radhermit@gentoo.org> +gvim-7.4.475.ebuild,
+  gvim-9999.ebuild:
+  Version bump.
 
   12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> gvim-7.4.273.ebuild:
   Stable for x86, wrt bug #511190
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index aea6f6d0e9ad..99a42a765478 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -22,6 +22,7 @@ DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f
 DIST vim-patches-7.4.326.patch.bz2 547801 SHA256 ef055424ee6a38967a38420c136ad54cde2f0da02417b9cd5893a1eaeae589fb SHA512 f047a9cbe01ce1820eed33b9ca7de769851b22e39083e17c6d41f1f9d705a64f608e12ad9a383d2c3d45da20466f4e6db26118424452b76c3344043c163bee1a WHIRLPOOL 01dbc695dc6ca698fa64bfc02a12ef97cb8d12e52992acf529fcc5f0264b8db58d33ef909b65ded282e77a06a352a23f5d592bfaa9d2a4ddfc566813bc725afc
 DIST vim-patches-7.4.417.patch.bz2 672822 SHA256 244a556bf45a11d9b9a8669239062a400e1e73ea940e54b7bbaca954da7fc6be SHA512 abda7e717a486f677e0f6720beecc903879deadac9a61faf628a7c590030b81269c48c20de6e1fe99011072e9e7a675552917e7d367f9c2d3596688543e371e9 WHIRLPOOL 4398c9de866a2a84257fe2cd6743a75c494ecbd47ef2d5dd4393834e84801bf1786905dbf368f65b98eafb1541aaa5eda05b81f042afea564469f294add3f548
 DIST vim-patches-7.4.430.patch.bz2 680438 SHA256 173ebaaf7e39e9cc9face31e6f8269ec7e5880998a8b846a80f88bc65fa40be3 SHA512 dd58e693286bf73d49a3f0625d597fc88c6a72eb386eae9f8e656854ac42f92a3e0bc0b43efd23e55d65040ec4f767ab48366753736b1b843b85c2a738829a54 WHIRLPOOL 7ce6e2de659103edf2dc5ff09c66fbe3d24d5f1fcaf34e49daef65a1d5f498c9326c5384615cb011848d60fb5ec538a531b28f63d2c2f9a51db979bf3141086e
+DIST vim-patches-7.4.475.patch.bz2 704060 SHA256 35e1f82629e888865d03ddf8647554a607d94fc5ba33502822fa171d4914aba3 SHA512 80e26c872793604b6ff76bbb9b63d10ed9633b448008158d2f2538e9a18c62f7070b5f014b221643d2e97d0d6f7812ffc8a038f7acb2e1558ac5a083d6db8ee0 WHIRLPOOL 983c51f3d1220ab0512491f04e72cbf90a2891d44c578dcde043737a700c329cc3a090f3d2bf581ad4a23b6765bb72517f76520da1299ea8a65c6ac5957578da
 DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
 EBUILD 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
@@ -32,24 +33,19 @@ EBUILD gvim-7.4.273.ebuild 12234 SHA256 9cccb531e99c93d8f4d2b51a7a9d50dc9b749beb
 EBUILD gvim-7.4.326.ebuild 12248 SHA256 40c82145cd3d9d34eefb4f56b0280ed27abdb879effeb59a02e1af9e99f6c7b0 SHA512 2df1d0ca7f8330cfbe0499cb2f700594c70c842a4582c7bfb54663e3dabae62ed1b8c8bec9120600f8ea9cca787db51707f7ea4576b6f7acf457a991e5da9d03 WHIRLPOOL 62bf6db969c6b37316c245c536778fec27c090b9c28c584137778382f5daea1a00ff88e8946df0539156c431bef1d2e82317dde60d57d0f52c1ca6f709cef3d2
 EBUILD gvim-7.4.417.ebuild 12248 SHA256 0df62861374c3f4e69bbfa92fb1134080e4e09c12e22180f468795ebe66b2be5 SHA512 9393a5ae3b977fe9bd181204091d835d21ec60ee0b4eb1449f7a7e6bedc9752a750a2f9e48263d89546837e14c10b7a39c24c532d8dda64b9ad68a43b82d4cff WHIRLPOOL 93bd0751c1eff490d6423ef3900e2505f441e02853c60bab8a33bb286ed05775ca890bbc0d9fde5ca4f6c8efc98bdc3f23d745099b0386f4527187175ccb5894
 EBUILD gvim-7.4.430.ebuild 12603 SHA256 fbb17afa454c85e8dac1dd925662edd347f94df9f6db35c48513d3cde210edc5 SHA512 674239cf064df438910e9945851e8439b55582180885160b00cfe9198c881d95ae459980d252209900cfacb280dca020ccb2ac35260cf43224c3632fdb9d97ab WHIRLPOOL 570f5b09d27e920659e984d454bca1217b58c030697cb41fae73c201cf5abee243df3f458da436762b529908ad7116d87187adc8b9900f8d0c673d9ff1f10f02
+EBUILD gvim-7.4.475.ebuild 12498 SHA256 d746afaaa070d5be60481bbabec1d20a9ddd3fca2b9c0e093171f566f51fec81 SHA512 34de2483f7fa3f738d035898d806ebd46b725b9df17b2beb02eef83ba25384d8f21c85880773a63fb025cb012d129af4cc844e353ddebac79659677b8e3c5d3d WHIRLPOOL f04142b405f76f91dc5ba955fa71f1ece8443c55243a74fea76c9c76500947faba04e348d2eb98f9c76973c38392df0934b1324b3de4b72d1af5f1a1ecfab439
 EBUILD gvim-7.4.52.ebuild 12559 SHA256 14bc67c1fac648ae0990ad6b91f73a35db92c6cd8135e7d6bd8796e193bdf537 SHA512 7f1625a0220cd80f9a2516e082c64f8b32ac984ed1ae0c3a3a72d93b8d4d37cefedfd60b40a115f3d9cf4ad13e6bb13ad8b92b50da26b77074d434ee583fe112 WHIRLPOOL f278ae87c4fa0e49835ce91b070f9fd5acb5be939c8cc65f6f5e798b21eacf14c779bd6af18809fc7f9561f95a92ac7e7998ad3a60856de90a9340ed5090a6c8
-EBUILD gvim-9999.ebuild 12500 SHA256 27153873e6a9d4ae1c2dc87bd30c02b0de31aafaa76bb723dc050552cdcd5e51 SHA512 83f7eb6d178ba747d13a6a45cb72702edd08675ab707b4cd7b8837af30ee9b27377818d95d3092ec79f2be9ea69e64e237674fa4b96ad46e7cfd529f2b9685ea WHIRLPOOL 744fef672ac6adda06a8423891f76dcbf04185590300c738b5742340bce37e9751a9b9cdd362fd0ce6ef48198cd60392ec193b9a973eea3af93c41a9bcfc34cc
-MISC ChangeLog 60274 SHA256 a921b0ec1b40ee6811179b973a21e615b8c7459ea71b3a24f9db972aaef28ae2 SHA512 a0c037b166f74b7be7814028ef558a7d2c03d6d7705da0ad2bc4ff1fcd256633ba314bb427ce3779487bc24a18a2a0ffc1b64cac1a821fe4a5bf575fd0e56040 WHIRLPOOL 2ff7498a81f6ccc1de384418e78b309e64fb6a1eb6afa3dd0ecd2ad8913bbbe19732d49870ea20068b93aaa39d5788bcd616a62b5b218a96e72ff344dd4963a3
+EBUILD gvim-9999.ebuild 12496 SHA256 2ccd4ad542131ca24141180f2ed53f30c60f6066590d2de70c068e2c67d57e2c SHA512 a5340b38d39db49240ce4c4e554b54c27ef8099dfadfa7b790c2b417281167c4d1f7ef4350d2774a829d00c0eec993dae3e5a6c4ba6ee17dd323b54155f19aaf WHIRLPOOL ed7ddfdf1a727db46b5632b94b1d18f39e236377127ed557145234c8701dc5b5b079508d69d289e95c9c7ad83c5a232891aa0e72ff243c828cec8cf9e887a077
+MISC ChangeLog 60417 SHA256 597c83d49add3dc36af04767fb5806a8e4f57849f7b4514954566c952b1a36c2 SHA512 a6e3d7eccd054969bc723eff2d6ade7d2fc0397cad5b795baceea0f850348910e6d58f4de6b3733a28b89116ead976964bf3f94dd0281a1729ad2c28677e0053 WHIRLPOOL 51bb2ab78dbea531e03cee0623d78746a9557315a3133a5bf584932090dba140794ecb915d75e6eaefd7c87086da1597e69ac86f93e882b6600f2f356f2ec76b
 MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUOkOGAAoJELp701BxlEWflJIQAMKbHVtKOnWY4XK3acyMyY7H
-iNKXKd+XP2QgqVq++7nPKsW7Rr9Au9OtZPFW0VfHGDvppbL1q778hjOI6Yh/Ze6K
-eAvXkvEAd1sW+JL7EtyModNrHv1/sj1Pw3k0wfbvpLxPFLNlmi4xZHqF83kNMLDi
-g41OUIKwZ4p9TIiidAL/jAngkkofJPhgNColuucLrj6TAonpZoixoogs0FFInUVz
-ob+3Ze7ShsqLLKy0r8C/LI+Mj1fGqOZXbny/mDxP+PXIXxYvQowyBn8fAP0pVpxu
-8kz9YOp+gJQoQai+vNqZOyyZrE/Kq/CHvL1ZVnXELRe02cdd9SFDSllbK+ZFTnQn
-+FG8PTwXdB7Bntlf2p/R4uNxoV0xtgKlCDx1agB+E51BOp4sfazM+uqxBivBXeBZ
-cxGnOU7VchiFdHq+wk3B8TC0G1lyyOoCCpR360zAgJO1DWKNzEhGsT7eXdCaK8ME
-zTRsXay+1xEy/iLhZ4lH6MXn+uuAX6xoPAseMaezuFZ5tRYvx/OIaPwhYFd0b0Z9
-GlhSxZpfdkjPFgXsGtmiu7bhGUULed22drAwcgT4jNKaNkp4p84wHfhKZ91wo+OY
-6KyNgw+tjbZUoSxXTGtmWvxNPJTPitDjFkLdVlh6JM2WWoUOrpO6GtBGuPAoV22U
-cjMFO9ZQDd/nXdVKnfpe
-=p7AO
+iQEcBAEBCAAGBQJUPEABAAoJEEqz6FtPBkyjnuMH/39pkcyLhoQg5y9AwQ3b6daz
+iwG7BqSLiHQYWNmpVuRstwwYIer5j4BxXg2HiUnlKwDIQUUlIWxWFnKALZEPu1HH
+9wuE9/T6uFzmHOdyHhg0unn3iNDWvKWIcgzctleMFq6ANXeg2fAWRwyq8G47Y5xk
+OrHoWSZ+ZhN/VoKU+vUep0eXHEoCilHX4uW0tVBVd0T/XZHrPcPtTxbcSy2YYtjU
+1CVqstTj+ENFdkqowmekpVGC+wNd+nIgZcKG5pxQpsLw4S6J0TSgsUHd57WvXoqZ
+C9Jotj8iUdTDrasOlQCSVTBlpSUsDD+5blw/EDYJoa3dWElnj/pIfwEswivh5n4=
+=86fu
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.475.ebuild b/app-editors/gvim/gvim-7.4.475.ebuild
new file mode 100644
index 000000000000..2c0c4179b908
--- /dev/null
+++ b/app-editors/gvim/gvim-7.4.475.ebuild
@@ -0,0 +1,405 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.475.ebuild,v 1.1 2014/10/13 21:11:06 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 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}
+		http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
+	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 session tcl"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	luajit? ( lua )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-admin/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2
+	x11-libs/libXext
+	x11-libs/libXt
+	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[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	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
+
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# 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
+
+	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 session xsmp)"
+	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
+
+	# 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 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i '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
+}
+
+# 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
+
+	newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	doicon "${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 ea9356e31664..1f047353df64 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 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.18 2014/09/06 17:53:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.19 2014/10/13 21:11:06 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE=threads
 inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-single-r1