Version bump.

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

3 files changed, 420 insertions, 9 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 31f47a1a6ca4..3c297cccbc67 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.406 2013/08/14 03:40:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.407 2013/08/18 18:24:33 radhermit Exp $
+
+*gvim-7.4.5 (18 Aug 2013)
+
+  18 Aug 2013; Tim Harder <radhermit@gentoo.org> +gvim-7.4.5.ebuild:
+  Version bump.
 
   14 Aug 2013; Tim Harder <radhermit@gentoo.org> gvim-7.4.ebuild,
   gvim-9999.ebuild:
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 9433f80c749f..ba9fb7ad8556 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -33,6 +33,7 @@ DIST vim-patches-7.3.646.patch.bz2 973065 SHA256 3d05cee86946b5f23eee1ae921f1fc1
 DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
 DIST vim-patches-7.3.905.patch.bz2 1238007 SHA256 e5e48fe3174c93ec0ee18ca7e1cc1276a35446a673a3275110fac809d4738a3c SHA512 fd97793b19b6683fe49f2325798a16210fc3d3ea061dda6a086a3dabc71a779308b29ebf4ca2464940d0563bae12a700ba6d512b3e4d7d3dde21b12c5c0bedd2 WHIRLPOOL 006b9acc43038c446ba0f6f85ff60e499001760623f7d1b3e3d1c6a662e073a36d9e04cf170296e1a10e8fd507fa04ce7cb9eae72dc0b69cb80898048390e368
 DIST vim-patches-7.3.931.patch.bz2 1308697 SHA256 3ce7cbd52f36e1733353b9f6d8ec36f80c394fd86d589128afa721eff07cbf86 SHA512 2415a7d68b9089d821b4878d2c1f575734a693f34e085ae9878770fa58cdae503b1edc0085ad9d69afc166b76801788c52835fa573db797fe331ae8d05feb254 WHIRLPOOL 1dec64fad1e1a1d018f8f504e202d3cef8a9ad6d704f53e1849782fa42b736d37429bceb6b877a0f606d1f6623c8288941e8f6a7bbe3d32a6003c25d3900497c
+DIST vim-patches-7.4.5.patch.bz2 4352 SHA256 796b8d4e1b758d83a939118d3ab2d8c7ccc64671e41ffd16c723f6285ca447f1 SHA512 6e4b33de2b61d2a451f71d40d8ffce1eb5ab8dc379db96f93a36efb2789300524ddb9e9f8e300dfdf8881ba095aa94e701d9530e9a650e994d6e2d0d35531600 WHIRLPOOL 6a2a15845d7522a32b313161c3d2edddfdc41c5cc9ae8b20e9eb3e3e958173a8a34ffd0775f0bd5675d5bced8b4d680b3023e13c32f3fc2d73976a8b8a2ce839
 EBUILD gvim-7.3.1163.ebuild 1079 SHA256 1c0fc2ab8540f618b80b3572c03b1bf428ea95bd87ebecfdb087471d3188ea93 SHA512 d0d7a4fbbbde5c6e61afd38d96b2acf5c78e71d4f710610f89c29b38cec68d29e9873953000f87f58d5c86a3547257404788dcf6e2a5f82154258d8f91a20b3e WHIRLPOOL 6332af20effb30eda6ebb5cbc11ca50fbc6cd17cc684be88c6611b7d3ece50032f8352e22d190b98b9a03ab9da6e24fe9860f15ada00b0220dbb2b3d25a3c41a
 EBUILD gvim-7.3.1214.ebuild 1078 SHA256 80b6f32eef384a97e81cc0191b1cccce3b001ddc0a209e5b596ee6e40430c241 SHA512 b8231bd8f3be1c0e9bae9aebf15cb47b752a2707b1aa799802e99d999e8237327af4a3e5ce5272410a9bea55203866054871a04e8dd888560b30e48cd5aa31a8 WHIRLPOOL d19a651f04b4712f730433b86945dcd300e3e296c9ff9e9b2a0a250600b60c9cddf9a1cb52ec9d7be9d58bf9f2c43e954c7dda3fef4795d811dd3f59b835f9e1
 EBUILD gvim-7.3.266.ebuild 954 SHA256 0de1975359dfe06ca226f6f0af6f7b9d7c1e86fdc435e10e6c447de84f0a4472 SHA512 7ee4fe03fd134115ef89bfe0c8ba4e9f2607910c3198a0daaae52bc606dac92856bb3a528196cdd7df01dbe40387ba9d4c5827074c81bcda6e0ac26581930389 WHIRLPOOL 1d0016f63390eb8f7d516cf878878df239e1b12bcc8618ec72375eef851394c243f474462a87b8e11092329b78ecda22862a4b2945fa051a2c563b3eb5369a7a
@@ -52,18 +53,19 @@ EBUILD gvim-7.3.646.ebuild 961 SHA256 cbb1a32a5c1e81edb59c62464a9fd6a27a168edd11
 EBUILD gvim-7.3.762.ebuild 958 SHA256 19a7ce0d8ad24047c022c866046ec63aab92efa911e87dea3d83f7e4b33e7dd9 SHA512 3966bd3a5cb514f99cc3ee5718b09a3fcb8eaf2e71c118a255a3ffc496b64d116a5321719a3773d38743b9552408bc2655373753a9e1b8e5f571d848226253e3 WHIRLPOOL 8095463dd1ed4bbace9ef0fbb9a2ce74fc49f1c1f431fc9ce83e8eed4d23c97f1eb54e90575baaa77b928eacf659322076256e511b045896b94e1ec5479fe5ce
 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-7.4.5.ebuild 12604 SHA256 fa7c227fb94d8ef56e75f7899f39384a46025340a829f685caae2f4d9227885e SHA512 4d90834bace2562eff823099cbf01fce57900c8bbac7e7d697f22883f937ee3626e4895b81271203947e8115fa5be963238c27ef9834b9079cf74adc72b2695d WHIRLPOOL 14fe3a622326c031020cedee5724020b31d5f83da89c626932dbde44620ec03837c66ca9cb2738984c545d6e5c33652ad9b64bba346ffafbc7dea4399d5792b4
 EBUILD gvim-7.4.ebuild 12604 SHA256 c1d3376c87014f90ee61b25b85142781d357f1642a287f105ce6adc67379e4c3 SHA512 c9d07f2789226598acf6e0275499c24273aa3b134a51bc628cdf72203c095dd1952e685673e23791a1524dd1546e9c6d049c94d8dbe232994458bafdd362de87 WHIRLPOOL c5141d870535c75b34c0a386ff842e87bb9025a87959792059fbb0150c5bbd5422090b9433f64be1fd8433a66b4bd4f194c1f64163416e11eaa8af1674e06dc3
 EBUILD gvim-9999.ebuild 12603 SHA256 e2f95ea514c5bb9664c7fd3ab5da8114368275886536af163c2663b5e376a6ce SHA512 649cc657d7d82de9ce66132a3fa1136de5a963c8591ed861d23376700e56e6097232cffb7ed197d83d92d1f946ef3ff32c48fa3ac814acc95e3f7ac67c850aef WHIRLPOOL 52714570af62966741026896a6adb11c4958fc28a31b6c65fec35e439134cabd04e4deb837aa1b245cead65ea84e6fd611f27a97e9ae7e1f3c0b3af43803ab1a
-MISC ChangeLog 54942 SHA256 89ed8457a7901c82a6761507b4e315e764e756222f77e3e18759d732312b4c5b SHA512 16433412097c914b06082ef31fbb78f292c96fd918e544abc35a82c8e88bd377b19233fc5aa4c988b62bc3f8f9963d5bf97c64229aedb091e49258fe4c0b1d96 WHIRLPOOL 5f4494aed457cb906daf8a1f268fad715fab5d64624ee63cef1de2c23f2c61614cdf56311471601c595e2446b08ce888aeb693575d0165a3447bebc4889b6a12
+MISC ChangeLog 55055 SHA256 eaa87307cf01573b684977bc6c35001e3beab5e606516cb3a341ee1f48b49f50 SHA512 9b87c745380c3bffe8fa5b985f8dfe274d008e6f03fdee8127831aacc1f9aac7d45fc467735e092a7ff95a2bfa820dfb01d0b5e05fe928c63f38b6e6695b7881 WHIRLPOOL 0e875153e9df21cac0b47952d52f1e1c11606776061505c39c4a8a96ce6ceb3c77566426946de39b81a58676d995fab6b4e1ae2fb7be10dc44abdb96ac07621c
 MISC metadata.xml 348 SHA256 e84bf1fdb970b616d6b2fb17caf3d3f75c276e52430c58e447f8a4dbbfd60777 SHA512 619abbfed97c2bf11f32ea519ba3f0a4a7c388723e6e60fc435fef7487fec143d4f9d492281fda9fd5b2f319afc3d89a7bc21aef962038296e0e13a23ce7229d WHIRLPOOL 0d72852f58d2a0682266ab99a5582112bd95588f781db5bec3d319d5cf1e9b54ff583a622047f5cf23f4165a83b591511cef01f510314710d798d8c688de1e98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSCvwrAAoJEEqz6FtPBkyjaDgH/2dXXmtPTzpheXPjmCnVTWpn
-6vtEBBGAbpBNmahbHg17URYdI2gBwPwJZrY+jzciw3+3A3JETFZMIEPqKI4lHEha
-cnoxoF5Ncic2IpedxSgGigCtceqCRvOIXQfTls7UB16m+juliwRdoQVgFM7WbQUA
-kIhpv00dRu7XNec2k/xosHEZ4e6tmyPS4h11kMg+H8mF2k6zsHBBvXd1IhSpCPtu
-A5oClABFhA/imnd+8snAllVjaDAoHYXTiAmqt0W4Ke1nVjO3aSEDpbBbL3ez0ZTt
-nK/F4Z10YvgybNg5QMt8bnbbLXLFp98rYzS0bu/aVFR7Zz1w7lzVn6EjRDVS0yw=
-=8TE0
+iQEcBAEBCAAGBQJSERFiAAoJEEqz6FtPBkyjsT4H/18/ZMG2pKTqKH39eFGiHLaT
+CbeBulOShANTJDgyJrzqVymRAGgkDt9KbuLg8oQR8Jf5bvlcVBBfUAljocnO4GL8
+KZWq42IZTLVGLfI+u1VwHMNkVVmWUEEa/DOTRtsuBcot0edM3RbisY/+4a6SyLn/
+noUzCqSk83jR2AQNWHd+JoR9e496KrUQzal/9qjLRI2o0bwJHRMAzwUtfn85VlcY
+kat2UDRRw1cxO8dO/P1bIG2wcEy2j1DL6WAyh25qsPhWpz6H/ckRNhJqRbo/hx/d
+zAMQXzyJPelqC/Dcw6ZF7FB2EQFiyYNOyqf8yoihVF1YPlfoFDCYzfMjSUqeO2A=
+=AHRg
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.5.ebuild b/app-editors/gvim/gvim-7.4.5.ebuild
new file mode 100644
index 000000000000..17c99744c18b
--- /dev/null
+++ b/app-editors/gvim/gvim-7.4.5.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.5.ebuild,v 1.1 2013/08/18 18:24:33 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="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-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.
+	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
+}