Version bump (bug #480512), add lua/luajit support (bug #436744), add ruby:2.0 support (bug #479470), and migrate away from the vim eclass.

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

5 files changed, 824 insertions, 20 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index ab98b783ba22..343c00bec75d 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.402 2013/07/20 05:19:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.403 2013/08/13 22:27:05 radhermit Exp $
+
+*gvim-7.4 (13 Aug 2013)
+
+  13 Aug 2013; Tim Harder <radhermit@gentoo.org> +gvim-7.4.ebuild,
+  gvim-9999.ebuild, metadata.xml:
+  Version bump (bug #480512), add lua/luajit support (bug #436744), add
+  ruby:2.0 support (bug #479470), and migrate away from the vim eclass.
 
   20 Jul 2013; Tim Harder <radhermit@gentoo.org> gvim-9999.ebuild:
   Update VIM_VERSION.
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 9e30a1ddea47..7f1e3aba9abc 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -13,6 +13,7 @@ AUX gvim.desktop-r2 171 SHA256 840e4bcac0b448566e26e53b8292f31a9e187360b6aaf75f3
 AUX gvim.xpm 1371 SHA256 adf603379740f509b0c543f9ac78a3eda7c804958c1a9086c50e7daecd059cc7 SHA512 550df3d5ae428735918cf0f364a1792d105312336c1d5f09c7187e20cd8470dcf86b37748388d20b4bbf3897f9868c6a9f981b8907ab488c354be02c26fdec98 WHIRLPOOL 39978c576662616e809618f1f9a17405f69d13ad70a94f783e28a64745a8c31696a32389d4fe9f50145056938c15e61a1a26143f362627c172d269bc8b559e8e
 AUX gvimrc-r1 1099 SHA256 d6a92cf8e9b7a3faf92285214c97adcae4fa6632a00e0c1a2bfa34caf167f17a SHA512 9f772a9b85f64bc55abb7ab4f76fc84a49dade11b7d19e187d0ffea10c5487ea3f2504d1a370fc61bc3ebfd2db4a758afba216ebcb50c85d8f40b1c4cc7084e7 WHIRLPOOL 0be48dc54a1ebf26531741a33e3eb27e4a5977dc220473d69837cdf1474b71aafb2511aa33f8fdd378cfd6ff4295a98a12c0183499bb3e22c746a88b88b43a65
 DIST vim-7.3.tar.bz2 9080692 SHA256 5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d SHA512 5560351fb005aae0be435a59de0218a8b4f494c8211a026838e8735a98d5010c395b9da6ec8c1ea31c75a94da7c6071f3eb0b7e5426f5beb75cc0d56ddb8d5b2 WHIRLPOOL 4ae549b9c6dcac34a676fa27dc1fb51e925d874fba932817eed8aeff56ad94d2dc4314219a94876b70776263575e1577bd80fb60a019bbd784c96ed74a5df822
+DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
 DIST vim-patches-7.3.1163.patch.bz2 1597785 SHA256 f5bd00a2972cfc8b4d557396bc142ce1f965893e3c47483c0fe3d42d577494ce SHA512 fbcae7b5ebb64a5f69f26d93163aab6a5db98ab80dbb37dc193e4c1c756e557e96e578039ecc337354947d3c6b66b7f78e0771440440925cc76f3c826139060f WHIRLPOOL 1626f352dda38805548201bd7119ed43240f0b98616272d3b191ff9fc0c39a3c700b3b7b8e541a11299732ef9529d6690c627a07d1dabdd086ed36c88de4a9ed
 DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
 DIST vim-patches-7.3.266.patch.bz2 482229 SHA256 28ebe4e469fad7a9f3a55611323e9235b83ec40c6abca85da485f9df02aa0177 SHA512 20c886db4820e7b20fa0c4700ad9cae118c04b84ad0dd6ac623735e53d2f3a618f94d91332a4e13025c6426e6565819cf10bac2c84264d62c534cdc77a926f92 WHIRLPOOL 603309375b930682a30049b4da1612ecd0591f7503222dff3732845a5655212ff6311eed1b91e66ae4e2964184734f2795f9ee5ac4e99e5d8040c8965310bf81
@@ -51,17 +52,18 @@ EBUILD gvim-7.3.646.ebuild 961 SHA256 cbb1a32a5c1e81edb59c62464a9fd6a27a168edd11
 EBUILD gvim-7.3.762.ebuild 960 SHA256 fdc9908bdddf2bca1fe7db48fc9adda653c9cda4cb87cd83f536d3aa4d3de4c1 SHA512 11b1b463516a6ec0f7417abba2b8b226103f58b735ff9c55dc6f30e860081f151cd3be17ee4cdd30d0ecdcf1a8df78d74d38901833370a4df0b9d013158269e6 WHIRLPOOL 1d35b92002f4bd66991fe91eed28ce61295526fefa5ac94d2fe881b8e6d09a44d66498fccaca748a80c47f9d760ca6b47f0152ca79991f22486eafdb378d957b
 EBUILD gvim-7.3.905.ebuild 1139 SHA256 e23ec1376bba1f4c2295f332f488f3e5043c2d2cfb63aa5d0c7f01f4b0c150f1 SHA512 68ab370c09d995ab92d19e9e8018f5f1850d49ec721faf959331fae1d1642b478930b9d8f08ef42a11e52e9fec9cf2b4c2f5094790a3060b2b78ae3fc58ed71e WHIRLPOOL 95f0052f7813d0f99a9764d8c3f8d76fabeeb33f6745c1d20f7d220237ba6d556eae29d648df8b4cfeb9cadd576dc2a673cd406854f230602dba7077e85e468d
 EBUILD gvim-7.3.931.ebuild 1130 SHA256 484f8efe9e6607aea9feae3c792140ffa4f847c3fbc4c0bf24ebf8347e205ef8 SHA512 10e1e9c9a7bec5cffb53421ce3857751a813633a0f0b14417882ca5c3a4f2e57ad107f3dce15949f32dba6da6b836d2dcb2548315f72839122fdbf904045456e WHIRLPOOL 849a8d48e6f1874184352a06d0858218f48d461539001357f5c2a174c5267bc1addd3880d06a9df072c83b3984c224896f04392726af73c56e55cc5d241392fe
-EBUILD gvim-9999.ebuild 409 SHA256 55c6a13ca05ffca6141798126e228c619962f62a4bd0ca5123cf816a01a64c91 SHA512 cecaa97eae12ae3ef63a8c78216cfd9e2df1b86a70181756b57682b13d75d2c497f8ca9fc50e54dc8854acd81849ef64e6831f8d7e0d026fb1cc3ff4c0b4654b WHIRLPOOL cee15c589dbbdfec02defdf1893ca0c229a06aec856ef77e5185e6ca2663c20b1eb73a90fd791abc91c9767d4d0e9ccd47f89918ba6876d62bd91c5801387504
-MISC ChangeLog 54299 SHA256 2094be265381598307605a9b762dd9da8c79da5d1261576f20f2dbded6b53fa1 SHA512 e5e90055c499c3786a43baf9620c32e5b8bcabad6d9d8cc5e3b9387708f68aaa1ba5739b40d565d64c276e383e0ac8bc4ea784e19575a4695637fb044fc92ef5 WHIRLPOOL b4efd820bfd6cc42f508cef96e3762f2d2271fcbe467d9d8c0c0add3fa063bf7d50eeca17ed1acb96330b34db2cdb0690da91ea082d19255ecc45debda802c07
-MISC metadata.xml 256 SHA256 f4c244e16d3addc264e2dd76e6fbf341a933584e86e2e325488580e5cfd88d22 SHA512 43a8d355895af346a37d75e0e720bc8a11934f781acf7d2ead09f2285f11938c428a15bdef3278510b1d8d986afd392b9895f40a9bf055492de66c784826d373 WHIRLPOOL ba679403f463f83c0b039f24a01d04eac83df70b0b964c7b6a3a9e15e69311333e5735bf12763a86da0eca4fa295b00bdde90ceafcdfdeb73248e769ae1feca6
+EBUILD gvim-7.4.ebuild 12801 SHA256 b25ad8e720976ff17e32a176ac044d1ecdc8791627c40692d4b2e5a427d6bd77 SHA512 629eae631cb0cda6b25c27d6e0da3f7955c04f2b42f74604c8ebcf3a71b62447f225bd98ec7be5eec57cd629f8a04f999f9b7280eb7be6e8925bf892e234dacf WHIRLPOOL 2890a5128f6903d64779f19a842f7340ca9363f375771540bb65f366d156cb0799dd66f2e8290d9156c1b59e98d0f3fb1b264ae48847b1b80498e65d3ebc488c
+EBUILD gvim-9999.ebuild 12810 SHA256 c824716e56d918d1398032b68979b4a1a8eb0a13a3e79dc1f55a7489a1b6bd4d SHA512 ce34dbfd2ee27b532dc3ea55f72c70d64c43d927d0c6fab7c8a4eedda0678211e736d6aa8b3b628cb20741edb9130db89a01edab27cbdcd48ca6ed60a3eb3522 WHIRLPOOL a9e7d903813a1f7fc59236535db143ae3ff6b52da144f3d66bb5be6d3430e4db81630689749c1d56268db77e59173cca9faff2d2b705e47d80bbb8d2f13f0ace
+MISC ChangeLog 54570 SHA256 0fa5b0221fa01a904020610ca419c2f554607e01f888aa7fc5b731074c445d94 SHA512 bb2035adb04e8eda4a9050719585f180fb27070baf7556a2a5700b74a1ad24bdcb215392241b5ef213a1c28c5b52d894f02f9a9a34d8fd7fd15c8572283301ae WHIRLPOOL f3a329b6e6db236039d0045c6b45365272f787530f0f2f4b5184173fa7c1210ff111bff0d79e62313a86836b886793afc2301268d71f673c523af7da3adc9207
+MISC metadata.xml 348 SHA256 e84bf1fdb970b616d6b2fb17caf3d3f75c276e52430c58e447f8a4dbbfd60777 SHA512 619abbfed97c2bf11f32ea519ba3f0a4a7c388723e6e60fc435fef7487fec143d4f9d492281fda9fd5b2f319afc3d89a7bc21aef962038296e0e13a23ce7229d WHIRLPOOL 0d72852f58d2a0682266ab99a5582112bd95588f781db5bec3d319d5cf1e9b54ff583a622047f5cf23f4165a83b591511cef01f510314710d798d8c688de1e98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR6h32AAoJEEqz6FtPBkyjsEgIAKdUJlUzsLVfRUcJ1zwv52ER
-xEJFgZQQVpQPz/8uNdrlddgF3e4FE0gB1xO+IxCaz0bnwMouF+dZ5MEhCPzRQ6zt
-2fdg7XW7ij9PGP1n3qfyfMhVmfHFHF7D2gaZs0RlyT84980LzpsebhzmpVRkS00k
-N0toVDarKR9bC3Am+pr5rvLhiFJ9h6bFOnMXMiaMYc0c2tYqgwctd2vh2fLuMWVz
-7GoSge7hjT3Spm0oQNggGF0jn8egm1CNwfRbFgc0VCpI9NbfVDVp46X+mLs31Erx
-qjgcXJaydnf/yrcaRU5txjol8bsnmVH8Z9+cTgMfOwngdFPV339HgZ2ENE9mzns=
-=3urV
+iQEcBAEBCAAGBQJSCrK6AAoJEEqz6FtPBkyjzfYIAIdtvMNgxJtCqU57/dS/Q1cb
+SXaJaf6ZKqQxHqULetrkRrLF/hlCfuIkKw7Qzts3MHbLIBwHylotOCLNcsz76J+A
+O17Zh6dYze/fSAk/fy8eGU7yrlmAsboMIvOP56ed4fVxKObOME4kuzYi49U5I8iy
+ozhUiiF37P3cDcugY1Sym44LhmmfCMN0rla2AbFzCu3p3RlEg1P+cMx1I8ieu9Kc
+ND+6ICHmHmTQw9lb/JngLUdnUsAtN5aKh9hBZLovPFUXJgWNqdkw73mLGffm1J8Z
+wnLuzKtH4ljokRMiL/2JhK9d8bSQbG2iuw4fL14F3whOXmJw++iJXLk/7/5fsEw=
+=jHv4
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.ebuild b/app-editors/gvim/gvim-7.4.ebuild
new file mode 100644
index 000000000000..eaed69a1909d
--- /dev/null
+++ b/app-editors/gvim/gvim-7.4.ebuild
@@ -0,0 +1,404 @@
+# 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.ebuild,v 1.1 2013/08/13 22:27:05 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 ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl aqua cscope debug gnome gpm gtk lua luajit minimal motif neXt netbeans nls perl python ruby"
+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} )
+	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
+	X? ( x11-libs/libXt )"
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-vi-1.1
+	dev-util/ctags
+	sys-devel/autoconf
+	>=sys-libs/ncurses-5.2-r2
+	!aqua? (
+		gtk? (
+			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}"/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
+
+	# 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 --enable-multibyte"
+	myconf+=" $(use_enable acl)"
+	myconf+=" $(use_enable cscope)"
+	myconf+=" $(use_enable gpm)"
+	myconf+=" $(use_enable nls)"
+	myconf+=" $(use_enable perl perlinterp)"
+
+	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
+
+	# 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
+		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 \
+		--disable-selinux \
+		$(use_enable lua luainterp) \
+		$(use_with luajit) \
+		$(use_enable netbeans) \
+		$(use_enable ruby rubyinterp) \
+		${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${GVIMRC_FILE_SUFFIX} gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	insinto /usr/share/applications
+	newins "${FILESDIR}"/gvim.desktop${GVIM_DESKTOP_SUFFIX} gvim.desktop
+	insinto /usr/share/pixmaps
+	doins "${FILESDIR}"/gvim.xpm
+
+	# bash completion script, bug #79018.
+	if [[ ${PN} == "vim-core" ]] ; then
+		newbashcomp "${FILESDIR}"/xxd-completion xxd
+	else
+		newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+	fi
+	# 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
+}
+
+vim_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
+
+	echo
+	einfo "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+vim_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 a629ee02c6fb..fbeab47916e7 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,13 +1,404 @@
 # 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.2 2013/07/20 05:19:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.3 2013/08/13 22:27:05 radhermit Exp $
 
 EAPI=5
-VIM_VERSION="7.4a"
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
-inherit vim
+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
 
-GVIMRC_FILE_SUFFIX="-r1"
-GVIM_DESKTOP_SUFFIX="-r2"
+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"
 
-DESCRIPTION="GUI version of the Vim text editor"
+	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 and gvim shared files"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl aqua cscope debug gnome gpm gtk lua luajit minimal motif neXt netbeans nls perl python ruby"
+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} )
+	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
+	X? ( x11-libs/libXt )"
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-vi-1.1
+	dev-util/ctags
+	sys-devel/autoconf
+	>=sys-libs/ncurses-5.2-r2
+	!aqua? (
+		gtk? (
+			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}"/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
+
+	# 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 --enable-multibyte"
+	myconf+=" $(use_enable acl)"
+	myconf+=" $(use_enable cscope)"
+	myconf+=" $(use_enable gpm)"
+	myconf+=" $(use_enable nls)"
+	myconf+=" $(use_enable perl perlinterp)"
+
+	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
+
+	# 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
+		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 \
+		--disable-selinux \
+		$(use_enable lua luainterp) \
+		$(use_with luajit) \
+		$(use_enable netbeans) \
+		$(use_enable ruby rubyinterp) \
+		${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${GVIMRC_FILE_SUFFIX} gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	insinto /usr/share/applications
+	newins "${FILESDIR}"/gvim.desktop${GVIM_DESKTOP_SUFFIX} gvim.desktop
+	insinto /usr/share/pixmaps
+	doins "${FILESDIR}"/gvim.xpm
+
+	# bash completion script, bug #79018.
+	if [[ ${PN} == "vim-core" ]] ; then
+		newbashcomp "${FILESDIR}"/xxd-completion xxd
+	else
+		newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+	fi
+	# 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
+}
+
+vim_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
+
+	echo
+	einfo "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+vim_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/metadata.xml b/app-editors/gvim/metadata.xml
index 90b6f096b766..fa11381c9d5c 100644
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>vim</herd>
 <use>
-  <flag name='netbeans'>Include netbeans externaleditor integration
-    support</flag>
+  <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>
 </use>
 </pkgmetadata>