Version bump.

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

3 files changed, 416 insertions, 10 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 578851615883..22cbd56ea4c6 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.426 2014/05/01 09:07:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.427 2014/06/16 05:59:26 radhermit Exp $
+
+*gvim-7.4.326 (16 Jun 2014)
+
+  16 Jun 2014; Tim Harder <radhermit@gentoo.org> +gvim-7.4.326.ebuild:
+  Version bump.
 
 *gvim-7.4.273 (01 May 2014)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index f1bc5dadaaf6..d5c94c9ed140 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -18,6 +18,7 @@ DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f
 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.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a
+DIST vim-patches-7.4.326.patch.bz2 547801 SHA256 ef055424ee6a38967a38420c136ad54cde2f0da02417b9cd5893a1eaeae589fb SHA512 f047a9cbe01ce1820eed33b9ca7de769851b22e39083e17c6d41f1f9d705a64f608e12ad9a383d2c3d45da20466f4e6db26118424452b76c3344043c163bee1a WHIRLPOOL 01dbc695dc6ca698fa64bfc02a12ef97cb8d12e52992acf529fcc5f0264b8db58d33ef909b65ded282e77a06a352a23f5d592bfaa9d2a4ddfc566813bc725afc
 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
@@ -25,18 +26,19 @@ EBUILD gvim-7.4.155.ebuild 12176 SHA256 100e8776c9a4901090b11fe52eb9dd93826ccc37
 EBUILD gvim-7.4.169.ebuild 12230 SHA256 ba711bbc117c9ab20fa949f5ff59bcc7b5180b7159e1fbe8ae7b95c4c7f3f4cb SHA512 6d2a9a43fb0edfb540fcc46672223ed274b9e71539aacac1178b9a8fb44bce0fb1c7fa6acedf3239cc9d59d0b4975b8b7d7e912518866366b960be290f0e48b5 WHIRLPOOL 467f352896767da1df0257c6b60f2f5aa13676d3b2d3adbf34a60e81558efe8a2fb86c926e784fc4e45aa5fb094b35f7c5d2ba171b32e5d4b56274dec5d4c20b
 EBUILD gvim-7.4.193.ebuild 12290 SHA256 3ecdaee6bbc07afb276854bbd8a78756f3cd407dc2519f0752be7f0653346d49 SHA512 3524582151999d798521ebd9d2f57a0878d83bd18b5f2946421dbcbef6476e1d683e19782886c72d9dae6d30e375f87fd9a138028bade36dc154afe279874fd4 WHIRLPOOL 4f247f058dd392e6332fca3eab8f428f29386018d2bee4c0f58c74ca1768f242c6406a97f55b20a54696edf08000d4faf2b8b24a4a4a3419ea88751322108305
 EBUILD gvim-7.4.273.ebuild 12248 SHA256 63ec3e87fef8cd447911ea8059f46855d5fbf8b84f6e8f4ccc7213eb3ca90773 SHA512 492052a61fcadc70df1e4f8af97c6c2edae8d74813c4d972d303fef84361b04b9a9a24f56dede16d16403512403eaf01ec909cd3e0f2f95cf55b3570375433a5 WHIRLPOOL aa89eea6ba6f214b93f80aa4702a32bc685ca0608a4e3e4f41d6e90cc3172da75b9862f35cff0c6fd277b329f375b10bfeadd90e8da153ab29dc02bc88865075
+EBUILD gvim-7.4.326.ebuild 12248 SHA256 40c82145cd3d9d34eefb4f56b0280ed27abdb879effeb59a02e1af9e99f6c7b0 SHA512 2df1d0ca7f8330cfbe0499cb2f700594c70c842a4582c7bfb54663e3dabae62ed1b8c8bec9120600f8ea9cca787db51707f7ea4576b6f7acf457a991e5da9d03 WHIRLPOOL 62bf6db969c6b37316c245c536778fec27c090b9c28c584137778382f5daea1a00ff88e8946df0539156c431bef1d2e82317dde60d57d0f52c1ca6f709cef3d2
 EBUILD gvim-7.4.52.ebuild 12559 SHA256 14bc67c1fac648ae0990ad6b91f73a35db92c6cd8135e7d6bd8796e193bdf537 SHA512 7f1625a0220cd80f9a2516e082c64f8b32ac984ed1ae0c3a3a72d93b8d4d37cefedfd60b40a115f3d9cf4ad13e6bb13ad8b92b50da26b77074d434ee583fe112 WHIRLPOOL f278ae87c4fa0e49835ce91b070f9fd5acb5be939c8cc65f6f5e798b21eacf14c779bd6af18809fc7f9561f95a92ac7e7998ad3a60856de90a9340ed5090a6c8
 EBUILD gvim-9999.ebuild 12244 SHA256 a11a4765a253c6bba585a99b672b477f33c1475bb8cc040e2f76d49629c6dfe2 SHA512 cc2fd9c5a61ba32c27c9fc5296eec2a5041ce6d58bba40ee362230f176c313894aa3b5a8a46af6cbc04dd978aaa232592c934c264cd72d3be020835772729e24 WHIRLPOOL 7a2bd654b8b1da01ee29b6ccf0073cd671b0f38ad1074af677c4f8f1b4f5148dde2001d68c502199aa942f810b1db8d970c0ff666d06777b0b303f1a08e30a5d
-MISC ChangeLog 58513 SHA256 1642a8443273a12797f101f6b3974953682c68cb50afd7c86a444ee04b938d75 SHA512 030eca7624bffac2d267826146587bb2e1f5dc9ebe2ccacbf80dda4370aaaa759d8f00741b28994636c9c56aafe9d7bdc3e0f415431b209360bd6e8d42016a82 WHIRLPOOL 471356936ba92b9f441614d731b2475e1f7e613d94e8a4a964e39a9115d37b6f9c65603dcca32adbc266a70bb157edaaa10d6caf6240a2eefcbfed729ce35331
+MISC ChangeLog 58630 SHA256 07094375fae31f1dac46035b4d5c1d0304cfd991fd598dbe462850590bb80091 SHA512 2e93568c19d5e1ee97951dadd6e524a933abd1478bc41dfe1c47adf317eaf64a69ceb09c185d9c65edbe4b00ab35bb35da65ad8983d26a48aa45a1014fc1f6a5 WHIRLPOOL 82c3d44703ccaea9e348000ea8f6adce933e3d7a73878bda9f65187b0a1919e949175fcc812627093acf0a9c1d0e7ccaee39b0f43f95b5367a0c0ffca0046abb
 MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTYg7BAAoJEEqz6FtPBkyjtnoIAKFldZC80VpoohUOaq5AtYi8
-bUDhpDfIUo4+knblwt6EH8yN9vTYzc5tfS0FsMy2Zz/KTG3iiCQhuWkklz3a1JVd
-KfuPoqte66Pj4xjePlXqMU394staIbB1+6g/E0rKfAKFXjc6SIQ2u0or5yHp/Cei
-5zHjeV4g24ZrbSqEqkOj8JHmYpirGuCEGZoANDPpBKhyMVmvEtBtPr5HrjR1+Wn2
-h7lAc7gHLmwoBQ4FV9z8Ea0MOYrjRGIm6syQHHJI58J5cxTAXkwixn0r3Qu8Quls
-EES4t9Wf2r//4TlHrNETYlOrgNt+c4HlUNoljFOXrbKTD34NM3mmYTH8OYZw8bM=
-=FZGx
+iQEcBAEBCAAGBQJTnofAAAoJEEqz6FtPBkyjJUQIAIkLwBNPNRWIvzlihjbyCtSj
+ooHbt4IJOydDhZBwUvPvJ/NmszGROq8O6nHnE3sHCMbQoWJ3ys9JKQiOOeak7TN9
+0Dx7iTmHhjXk1EaWRouVMdp8DjeYz5K+1FXbjmfXUHBiQZlxwUy+ZOvYsSYy4A/E
+jeORzKT3b5mrt/tHd151T4X4zmC0RFoznxKObQ5XfwZmoINnMRWMeW7XR7nOGqyG
+tGOCHv/AgHk0VzgviwdDzjgNBYIOQ6jVM4jDp4jYKXOls+UU42s2waYjJKXzvHVk
+qcxajoVEKrzyYHJT13wcVv3uorxZRqK67MwuxrFCsVqbxPas8WwPMerW2HkxvEA=
+=WwFE
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.326.ebuild b/app-editors/gvim/gvim-7.4.326.ebuild
new file mode 100644
index 000000000000..631931791c6e
--- /dev/null
+++ b/app-editors/gvim/gvim-7.4.326.ebuild
@@ -0,0 +1,399 @@
+# 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.326.ebuild,v 1.1 2014/06/16 05:59:26 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,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}"
+	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 dev-lang/ruby:1.8 ) )
+	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
+	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
+}