Version bump.

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

3 files changed, 247 insertions, 9 deletions

diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 3ef60dac340d..5d0961ac7ba8 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.454 2014/11/24 03:50:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.455 2014/12/08 05:40:06 radhermit Exp $
+
+*vim-core-7.4.542 (08 Dec 2014)
+
+  08 Dec 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.542.ebuild:
+  Version bump.
 
   24 Nov 2014; Tim Harder <radhermit@gentoo.org> -vim-core-7.4.52.ebuild,
   -vim-core-7.4.155.ebuild, -vim-core-7.4.169.ebuild, -vim-core-7.4.193.ebuild,
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 949bf840678d..1fd8eafa48e8 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -5,6 +5,7 @@ AUX vimrc-r4 6919 SHA256 9c59acc4c486a2aca5c6e5e297f13521a8ec57ebd540ec9ab846112
 AUX xxd-completion 461 SHA256 580064ca4db3ac149fd89c743bd9946241220c211721f978f7a3ef97b3c171df SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c WHIRLPOOL 65324afb44612f1dd8f8850b7caa8524cff055d83aaad74c5b5030787463d0a95dbe0ce1b91c1a7b7f3e6954db3c0608ac2a2e1e75572af94e83758237b18447
 DIST vim-7.3.tar.bz2 9080692 SHA256 5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d SHA512 5560351fb005aae0be435a59de0218a8b4f494c8211a026838e8735a98d5010c395b9da6ec8c1ea31c75a94da7c6071f3eb0b7e5426f5beb75cc0d56ddb8d5b2 WHIRLPOOL 4ae549b9c6dcac34a676fa27dc1fb51e925d874fba932817eed8aeff56ad94d2dc4314219a94876b70776263575e1577bd80fb60a019bbd784c96ed74a5df822
 DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34
+DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
 DIST vim-core-7.3-gentoo-patches-r2.tar.bz2 3063 SHA256 cba8a43aea20457b9177be978ac875155288e6e83f05a3193f5dd381d56ec3c4 SHA512 0f4c12057dec787e10d38c3581181b7fe28f032fbc131674a37904afe196938b2e2de8611ee49c9f817cbf9ece5a537edb048a82442aad01500f6e2ad2617968 WHIRLPOOL 0c3cdf536b2ad9d1470fd78f5256b198470e864d05125c67a70e0de873cf2df353769750e7f41c8db0fb56a12a38ea7aa02e27278c1d216b7419cb213618baa6
 DIST vim-core-7.3-gentoo-patches-r3.tar.bz2 3379 SHA256 2e0b38221b69d13c43cafb8c71f5be322785b12168278541a6006378c722e650 SHA512 7bebe548d1f65309f022bd459eb10364300cef9363298bf492c960730865b30b789392b123803fd3c3a5a3fb8543b9a83535c593b587a3e1f00290e9d2295714 WHIRLPOOL e75285549df9f4a9fa49cac19f0592ff4e5c87a07075dedd59f4806a104147bd9259de3e714b81b6d91bbbec9613c5f8dc3308649c8a38914cf29db22d539ac1
@@ -16,6 +17,7 @@ DIST vim-patches-7.4.430.patch.bz2 680438 SHA256 173ebaaf7e39e9cc9face31e6f8269e
 DIST vim-patches-7.4.475.patch.bz2 704060 SHA256 35e1f82629e888865d03ddf8647554a607d94fc5ba33502822fa171d4914aba3 SHA512 80e26c872793604b6ff76bbb9b63d10ed9633b448008158d2f2538e9a18c62f7070b5f014b221643d2e97d0d6f7812ffc8a038f7acb2e1558ac5a083d6db8ee0 WHIRLPOOL 983c51f3d1220ab0512491f04e72cbf90a2891d44c578dcde043737a700c329cc3a090f3d2bf581ad4a23b6765bb72517f76520da1299ea8a65c6ac5957578da
 DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66
 DIST vim-patches-7.4.527.patch.bz2 791537 SHA256 18cc9809e5322ea121c0326246d268bd7e8a56457fa00c12756538f0efa4d80b SHA512 55cfe5be9a4f356c8053450b55c79a8ecb38a64a77a97613e020de6ff9149508f7298a9ac3adb2b830e7cc1d68e183986ceb894401a8cce011e020371286f8cc WHIRLPOOL a7d443387705bd89ff7ea17b915842f8d055640546715836555361de0d7d6bfc82b9211cedfa51ebf2b4b8fbb294dcb6940007e1884a53e5ad7dc4f352ede4df
+DIST vim-patches-7.4.542.patch.bz2 819067 SHA256 b4bce59981be70daf11e28c92b958e4dcfce1b2d57d57ea6aabc5c0c8d50bdfb SHA512 f47a27cad1ebd7e7ba4664cf1698ea1781eb148f49f492b0579c354b224dd3a725ffa39fc4430da0de4890851bc22b9e9a2ff7a70217d46653446b796ef763b8 WHIRLPOOL 61bd9ffa831fd87e68fbd3d4450dea5b655590b9a9a15e0918085d15f09060e01014dd8467e26362e873ac5b94d671eb827720a706a11ee5ed78645d1b917d41
 EBUILD vim-core-7.3.1214.ebuild 1003 SHA256 0eb20cab51102107ef9c8df2e39d38f0d3f2e15e87fe88f271299f95e84b3e9b SHA512 eb4fc44617eedf81ffed762f28a4c8c0bf3b0b2fad493ef3310aa2782e5c45017bb2fe7f37b737649c17d1a4be6dc6c612b64301c80f9424d57abfc3eefac142 WHIRLPOOL 715d73a38bf97b2d3e520d8e6ec5e82d22392ec00701a743a0fbaf1de313bf1fac62d777268ae6da676cfa5730548d3337c46fe0cd36e6a6f85e1ad1986c234c
 EBUILD vim-core-7.3.762.ebuild 990 SHA256 4da64156648f1030702b5c699cce68b092631518fcf14b21cc787fe2cd86d6fd SHA512 fd5016260cab99b236147f090aab3b5e65cbfe5cb6f182d8e5e3638700a00969a0cfa2d20e3159241b21dd4e03035fcdd7e129017556ec128413531fe88e111e WHIRLPOOL 61485a3b00b0a1bd883ba7a8b3481844a7f4bfcb906e859da649d7487d595a17eaddc4a6617918e9750fcf0e9bcf91f91aed1a2dd3c18c7eb0915d672af0cd36
 EBUILD vim-core-7.4.273.ebuild 7307 SHA256 b9ca490150e34c11c88c9c1689da45e88828ad45bab847d5052d79e44f909dba SHA512 71c9dd301b8035815ffedc0920c97edbd89c27f8380ed2192fa794e469dc50db385391305c1b7f162a472afb16895466ebdaec8422d6a35b6bd437b5c4519725 WHIRLPOOL 886dbc182aeec81d5a5457f11198b3965aef5e9f86961fbffba0d36db62c37465250ce9223b1e80cc9d962de4dd4de21563bf40ca6deadf07604410331f58a18
@@ -23,17 +25,18 @@ EBUILD vim-core-7.4.430.ebuild 7328 SHA256 eb8904c14df9c7f281136e9bb9cea5c9cc924
 EBUILD vim-core-7.4.475.ebuild 7328 SHA256 c315a6e0b3dcc88eadfd80b51e5bba5bb8df19c141858606da4467261f4f11be SHA512 acf8f8188a1ce95417bfe8842d8e35e9c9b504d0dc3769e1e21a87f71740096d82165324d30c7400525efe5abb254ef7094bd81ad91b4f03e724b3f4518788c2 WHIRLPOOL 126766f23f34048a250cbbd0af3e1f81264e0f0aeba469a0ba8d5f296e3a6b51b7d5030b9d708605f782281c980dcc527403644bb6a7c895444d5c7ecb1483b5
 EBUILD vim-core-7.4.488.ebuild 7329 SHA256 bac64687000fd5195b60023a7de517101e78fd0879f7ef24a3b58f979e0fd756 SHA512 074d4653a1e2fdb6a0bc7eb4de4632ec83a2c6961d0922dfcc6d7d173c2dee566fed646aa343f1be1ea7c469dd8e29d28c4a7374d89ef761d9ed5b5d673c2f0f WHIRLPOOL 0c7cd4950173f36a0a6e9c11415b220eefe4e003310e5835a1624d769dfa8b8335ea6768c4b6ea70106bc3e07fb1870264877119a9231fb3707bcd12771e5a67
 EBUILD vim-core-7.4.527.ebuild 7304 SHA256 70b799da600d1b4c32b5790c7785150fd4be21ae129e91f3d522ed3e18445ae8 SHA512 6daf6ce5dda3586d1625a77456a3b83e28b84b831d3b76049620cf7ff1956158b80016204fe0f3bcb86c54cc6ec657b46e99c93833b04228db228eccb34f6738 WHIRLPOOL 9f618984c79e82b4f5cac30668a7ee8c7fd0396c32a70530dea1692eb52304c5800c0af6e73e95a9529e98cb15bcf98752d57bed2cf25411a405b6e399efc4e9
+EBUILD vim-core-7.4.542.ebuild 7295 SHA256 de9c01a6270db1e8a5bc97545d018bda8b2b087214a18313a4a975d5c2db04ce SHA512 eb0bb59ff4fb6f8e129233a2ca4be9300524d3dbfa83c15f1a2274c449a930177bca9e65dcd675a731e7b94d67045600b968177cfce0ed5321ee9a59e8fcee4f WHIRLPOOL 81a85e15c8f458dbb21064addaeffaea46003f1ab76f88dc0b753310c86407d2935d83dcc69caf7c0114596ed35ba8fdbb8fbc119195988263266a5e1b0e5eb5
 EBUILD vim-core-9999.ebuild 7302 SHA256 305a4f899aaead5c256d19aca0b803b02bd37808eaf1547efac63770d901f3e1 SHA512 03c5b9510f8bcdfeb2a804ed90f79974344bd9305a03b214d5b302294e05260da7bd573a3e6e465773390fcfd8655c45358bab0f4134995f24dbb71556b9d9bb WHIRLPOOL 8fb39d4495712e7519494be708521858b7b6878624f61fba428571ccc2012bf1412ce6c77c25f0db724a4b7f5dd70eb450e423ff3b83a8ab4e876db3a9076ac2
-MISC ChangeLog 61805 SHA256 7a7a8a8f93ccf9a4348b8c6da8d5e71bb5ca097a1fdf068a2c992caf35ca3948 SHA512 8db32498b4ad28b28c3d2e68c9c64d893e0ef916a5507ca81152859a462f98a7ed7b5ed52264276ab362bd99ca9f13c264148a58fe031e44ebd68093fa36a1ed WHIRLPOOL 746166116340eaac18980bfef1f054a5ecbb58bf518aad577926248d7b0ecca73269e98ed121d966372c320b5e5716c87df8236af4322600252bf3fb2ac675a3
+MISC ChangeLog 61930 SHA256 7252885db19e52e1f3533c81537e21811ecb6f279a0043d1fbb9aac099bab6c6 SHA512 2f088df691db5af0b56987b450d37baf4bd0d04929b7d18340ba8b4f739eedc24156d4da73ac41be066a46ed0016e19f1694ea11d7f30cb1633f0ac45e3d9225 WHIRLPOOL 189a0584fbfe95279fd5cf6e6084f94b2c589c239f7fe57982e872386581ada3628366d44ba7df5a86df588bce1c660eabeee9a7564098fd7623483b8eccd55f
 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUcqr3AAoJEEqz6FtPBkyjqNQH/1+DCMby4BD4ZYm8upuWZX8c
-+lzLVtntudmsJpEMFX+rW8I/g6lAOLDEfPurvN8URiubDP3sDEB2oPqf6LPFwIsk
-2rYOes5WjTExIO9u7YVba0cn7DGZ/ScEeUoWJuXYCbxR+bY/GD45aUlGR6AROMXt
-EBW0JukW45INQRLGxl1pZIsmD9CqoDKPzZ/hcuiidDwn1ezxlNvTIxPpK9Mg2YzP
-g0jLngH6+q7sKXTV3FhvtsIaQqjd5mSIVk0aHB4Ko9wVV83OXgx2tzgkyrySnVaL
-W+LIQdt9ijj4rYBp4gP2PfUguAbqSsEgeG+/3qZfGnabisLM+NEHazb8ialUDxE=
-=21hb
+iQEcBAEBCAAGBQJUhTnCAAoJEEqz6FtPBkyjZlsH/RRkDKNUWQCj489VEUMUQHor
+g2FXZoVs8Du8ya/fUMs0fSfxGYfwcwdGvZloUgMh+tj0AoPGnPTispi3phtCQPOW
+allSOYpiG4Pt7gLr72D2nwdW02VD4qpMGdL69COoP4V4BsdOWcRHb17SozK8KKZ4
+oFXLOjsvu83cMcx3ug3ewlhda/sWz78CXHk6XS82pTuE/e0whNKcgMpzN2nXEXbA
+N9/iXb3uwIQE/y5BHP2XuqbRDh7eBvGQJCx3T8GMphdRVFD339+w0P60HcUlcF4T
+W1qoT9gsqsQpiBTlcR1sJFQTNJi0l3KlxWcx+AW/hr0pJS1LAIHXdPp5uqEGpvQ=
+=FhKX
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/vim-core-7.4.542.ebuild b/app-editors/vim-core/vim-core-7.4.542.ebuild
new file mode 100644
index 000000000000..8e59e38bddb7
--- /dev/null
+++ b/app-editors/vim-core/vim-core-7.4.542.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.542.ebuild,v 1.1 2014/12/08 05:40:06 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
+
+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-${PV}-gentoo-patches.tar.bz2"
+	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="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+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
+}
+
+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 -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
+
+	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
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	cd src || die "cd src failed"
+	emake \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		install-icons \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r4 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal ; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
+		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
+		rm "${ED}"/usr/bin/vimtutor
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	# These files might have slight security issues, so we won't
+	# install them. See bug #77841. We don't mind if these don't
+	# exist.
+	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# 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
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}