Version bump.

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

10 files changed, 1044 insertions, 33 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index c3960dec8b2f..fca746ab0261 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.420 2013/12/23 10:59:13 hasufell Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.421 2014/01/23 10:32:46 radhermit Exp $
+
+*gvim-7.4.155 (23 Jan 2014)
+
+  23 Jan 2014; Tim Harder <radhermit@gentoo.org> +gvim-7.4.155.ebuild:
+  Version bump.
 
   23 Dec 2013; Julian Ospald <hasufell@gentoo.org> gvim-7.4.22.ebuild,
   gvim-7.4.41.ebuild, gvim-7.4.52.ebuild, gvim-7.4.94.ebuild,
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 450f9d8dcbd7..ec22534c2fbe 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -14,6 +14,7 @@ DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a
 DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
 DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
 DIST vim-patches-7.4.131.patch.bz2 164514 SHA256 09069afb27ee9996730df5163d016bc286788f7f2b3652e9e4b43a82d697ee0d SHA512 a3db66c2ce9209e986fed70b7775717f96339ff5d4456f546f7c4f8b896010ea01b09095015ed62124e6322218b641a672e33d7c3290d4e4e6b7869554b94fd3 WHIRLPOOL 3918ad4117b087a5aa1c3f076b707cda4d60fbd0398830203b0e92e435d281cab8606d563787a586387882b147bf9948066836423acd1ba0b0a90b86923bb76d
+DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f13c4a165770cef28bb76d8dc7aa630671 SHA512 0667810a1ae908f5739ab37b32688fff3d65c4f69e83d3f9d0364112e8e7f70c77eeae3d672725df25ad837a75e373619321c1f183e7ded67afad544fbdd7801 WHIRLPOOL 829ab6152daed43323af6537669d4c3d6367138d0858c746ba02a6fc15497ef7161c62ccbe9bac7526296f5adf52a4ba1fe86c3539dd559ddc5cb4f6e0f90cfe
 DIST vim-patches-7.4.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
 DIST vim-patches-7.4.41.patch.bz2 72664 SHA256 00eeef3f3f7ce8f2c8ffa163a85fecced465e0a66de3c3cc8963322c8b894b72 SHA512 79ca4b7662c01120471c86d6649904e3d9c68c28958ca96a0548fd3411cb8c678b977acdd4d42977ba6c823efd3e16e765a31a8575c081a32b651b63dfedd710 WHIRLPOOL 5ea5c8a7e08f57603f1c0df43e4e187f60b0a17c5c549999e8d79d8de15365168fd38c5f28fac32af5d57f5869cf132a49171f4af6d4cc769f878207c8fcfa94
 DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
@@ -21,21 +22,22 @@ DIST vim-patches-7.4.94.patch.bz2 143772 SHA256 d9d18940bb3ffb8a16dc443d9cc27709
 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
 EBUILD gvim-7.4.131.ebuild 12175 SHA256 86ab86e8492771837199b4239d83da4cac6cd1689a3dd3ee0ef1e75cb2a9f6ce SHA512 6d8c11e9a83fc82706df759c68a8e29e37a323cb17699d0ad160eec0d5f75d883088e7639c1ee9a16a0664b49b65bb6785db6accb07555f522c594af0461c8d3 WHIRLPOOL a0db29f949ce759c67321c7d1e7d7c091d19b49408c6b7958c7185b902b36eb886672d6d65fd20aea0dd5436b0b3d09e09ea73d3da3a51f453990e1aeec91d11
+EBUILD gvim-7.4.155.ebuild 12176 SHA256 100e8776c9a4901090b11fe52eb9dd93826ccc37f1ee7c86fbfb0f1c3c62f3ff SHA512 5dfa0df6a04f94906044190d0ed2c50daf82f8173a3429e927b726099ea4ee378e20097bf59f18f3a9e36fe3ef59d9cb7b84b0dc79800052cccf18148a1ddcb5 WHIRLPOOL 5d4a093537d250cd487df5c6d57f2dd5a3be4dddf83ca707b7d3786cd6a25e93af8d41610fca1e3c9799987efe4971302fbae9d67bd5fbf30fc90ebb08b59a2f
 EBUILD gvim-7.4.22.ebuild 12500 SHA256 53991a8d5303675b3bd9f40ebc6009d81a3ced6aa86ab8f2fa922c98e6e14e9d SHA512 470a199da6d7988935f7cfd62453e4693d6cf4897c8e8e09455764a3bda7f0c7cb075c8741488cad1aaef3c52ab8e4d1e7881225a53777a93cd1fac34ca123d6 WHIRLPOOL 93bc8f4861f096f692f41641aa47734afa71f2051959621f10d2a69fc1ea35c8a2b683d4c22d8731513215d56d3b0d21cffd3c69ef563fc2af4b9e4cd60683a6
 EBUILD gvim-7.4.41.ebuild 12500 SHA256 3669b46f7a4b08bea1cf68530134b63e079e957d7a26e549a5add2b05a7ff7ae SHA512 1a30f241dc18c569a3505302805952b8d5ec24c20b12b1807715e4ed3687f3781da45680fc4aaa26b7ff5699f6ce3dec000b73dd01ece2a5971b641c94d073d7 WHIRLPOOL e02cdc454e6c630d30713180ff9b68540caf260c429481ae4d066529b0687f6e2b9116e1278e36bb54568057c8e2e54397e161214dfc53a514572c212c7cd4bd
 EBUILD gvim-7.4.52.ebuild 12559 SHA256 14bc67c1fac648ae0990ad6b91f73a35db92c6cd8135e7d6bd8796e193bdf537 SHA512 7f1625a0220cd80f9a2516e082c64f8b32ac984ed1ae0c3a3a72d93b8d4d37cefedfd60b40a115f3d9cf4ad13e6bb13ad8b92b50da26b77074d434ee583fe112 WHIRLPOOL f278ae87c4fa0e49835ce91b070f9fd5acb5be939c8cc65f6f5e798b21eacf14c779bd6af18809fc7f9561f95a92ac7e7998ad3a60856de90a9340ed5090a6c8
 EBUILD gvim-7.4.94.ebuild 12099 SHA256 bb766dfe248bd5fa9c8abfff89574542cc16b4f01cf3f69520521dec74d40337 SHA512 114c4784b134e4ab5ed206dcdf940255a99062eb0c7ac11f0c2a71fdeb34f3075de017b8549b8e290c6389bbb3290da0c98fe37feee6d93f117dc9ff41bc892a WHIRLPOOL b512814bed1c5e32b1f50cfb252080e15a68dca6353214589115150e12fd90b4cdee6c00e1403c0217ec58bba66689b33b623b9cca6b47e2bad818d82575e766
 EBUILD gvim-9999.ebuild 12173 SHA256 4a56ac084b5051b1bc9482ee6edef3ae4c65361d6f3d4aa89c75c906945e29d2 SHA512 1c10a361d3a733a8170b5685d428e833d722684a37944f28dde1ae5be39df3fb61be2348d76b3ba7ff78abf6584ebdadd488b69da1593231c4faabdc1a87f7f6 WHIRLPOOL d3e802952c1420a406c942c157fd090f6fcc0f71f477f6ec42854a512f5fdd2c9eb225ef435beef3f340eebe7cc03e7523e18b1403e156956383fdba6b6de55e
-MISC ChangeLog 57554 SHA256 547920f7d6cf97bb17e259b5c8f0e0dddd3da34538ed6dbd4c57fbf09107ec83 SHA512 e34f33118c24e3e6279781003009b96b8ef33fe0026f833ac034209596a9cf3f6fb27bb691194a13cdd030d77b1b7f2ae37a747132f920f8871f79e8a87497fe WHIRLPOOL 6c3a787ad3cfa6a9b302cdfa9ad0d2ad4a57c6d8a9adf76f0f275074dd5bf712c7ad6c88b0e6e372b65f22273438b6f4a18569dd35e0d819ccbaf703db110730
+MISC ChangeLog 57672 SHA256 cba8b6ef3d2fbd2a05b638bcdf94b55249163dce67204ddda4d29009702eab68 SHA512 8af985cac4acf4b979a9e5db0017a750bd5dae98646c4f7b594db7c4bb1890088feb14d7b46b5ea319fdb35c0d8474e90a8dce21585c723a595231e30f576510 WHIRLPOOL 81e4b0ccea25082b5c72df0795421e7c197c63854f8fbeb77a40c5e0cd372a25f43d4f7d79e27838778ee6feae9cdecb4eff9f1dfba69b0c2b0172e62fe66c3e
 MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSuBeIAAoJEFpvPKfnPDWzwHsH/iuwu/7Ys/IZsWbqSdXaIsmx
-IV7Jd8Uah056ZbO5pyrWEFXrcCmmpHFjWJkBc5xhKX2S7wqtcCmUYO7Bg/8EhnPa
-rUWeW6W5zrIbVDfeGctby/c1sD4E9TDJpO7hQxAFLiuTPuZtQY59O9a8AoN4sfPP
-Q/4rgTAGovQnT2hLFepIE7IT0Au3ViMn0AWyoyOoMYDVZdh/hzYJeGfbrR3/GqE7
-QsWHfCzv2RROgDN7EpWG1Nc5V54xIrswrD/+cb3LZ5uZsjff25Tf58/U6/cqCfTw
-/H5iZdlhZ98ztAnGHrNeEjGbf0zb/3WQScCQv7bmEeNUXIJ25+HOWh+Dvquha+o=
-=Y2B4
+iQEcBAEBCAAGBQJS4O/PAAoJEEqz6FtPBkyj4dQIAKQuTA0go2U0lt5wvJQP+5yI
+Fmc1A1QBA79b6r3qyKZY99nvhwPX5t0HeJRPfCHDEiGW+lpXP8l/wWUEUIYTYHQ3
+f/uVN1PweXOGXudPIoq3nGoiV7MrA7rrsd6rLM814L39ALcEUOOfnXSrmYJgXPve
+ol5yYJrNMURwySlaV9lkjSR01QdurdXvPTKk+xd6kg0fBVpm5CwB7HwwmBgxIFBi
+k9Btnj+k4GML1cILpfPlQtcHS4PaLr6I+BNTdjYMEx5+WIhMVy5Inf4ald2NUqvO
+zED6hJKzKHcWaypCsB5v5OMfMS8AiP2/LFuXsomXnUWm5Xg/AQ6gSaSdUzczuUY=
+=HdUd
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.155.ebuild b/app-editors/gvim/gvim-7.4.155.ebuild
new file mode 100644
index 000000000000..b0cbde9ed9f5
--- /dev/null
+++ b/app-editors/gvim/gvim-7.4.155.ebuild
@@ -0,0 +1,391 @@
+# 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.155.ebuild,v 1.1 2014/01/23 10:32:46 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="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} )"
+
+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 )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( 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
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf="--with-features=huge --disable-gpm --enable-multibyte"
+	myconf+=" $(use_enable acl)"
+	myconf+=" $(use_enable cscope)"
+	myconf+=" $(use_enable lua luainterp)"
+	myconf+=" $(use_with luajit)"
+	myconf+=" $(use_enable netbeans)"
+	myconf+=" $(use_enable nls)"
+	myconf+=" $(use_enable perl perlinterp)"
+	myconf+=" $(use_enable racket mzschemeinterp)"
+	myconf+=" $(use_enable ruby rubyinterp)"
+	myconf+=" $(use_enable selinux)"
+	myconf+=" $(use_enable session xsmp)"
+	myconf+=" $(use_enable tcl tclinterp)"
+
+	if use python ; then
+		if [[ ${EPYTHON} == python3* ]] ; then
+			myconf+=" --enable-python3interp"
+			export vi_cv_path_python3="${PYTHON}"
+		else
+			myconf+=" --enable-pythoninterp"
+			export vi_cv_path_python="${PYTHON}"
+		fi
+	else
+		myconf+=" --disable-pythoninterp --disable-python3interp"
+	fi
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope ; then
+		sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+			die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk gnome               GNOME2
+	# -aqua gtk -gnome              GTK2
+	# -aqua -gtk  motif             MOTIF
+	# -aqua -gtk -motif neXt        NEXTAW
+	# -aqua -gtk -motif -neXt       ATHENA
+	echo ; echo
+	if use aqua ; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=" --enable-darwin --enable-gui=carbon"
+	elif use gtk ; then
+		myconf+=" --enable-gtk2-check"
+		if use gnome ; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=" --enable-gui=gnome2"
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=" --enable-gui=gtk2"
+		fi
+	elif use motif ; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=" --enable-gui=motif"
+	elif use neXt ; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=" --enable-gui=nextaw"
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=" --enable-gui=athena"
+	fi
+	echo ; echo
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim --with-x \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# We've got to call make test from within testdir, since the Makefiles
+	# don't pass through our VIMPROG argument
+	cd "${S}"/src/testdir
+
+	# Test 49 won't work inside a portage environment
+	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
+	sed -i 's~test49.out~~g' Makefile
+
+	# We don't want to rebuild vim before running the tests
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
+
+	# Make gvim not try to connect to X. See :help gui-x11-start
+	# in vim for how this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../testvim nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	doicon "${FILESDIR}"/gvim.xpm
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "Vim 7 includes an integrated spell checker. You need to install"
+		elog "word list files before you can use it. There are ebuilds for"
+		elog "some of these named app-vim/vim-spell-*. If your language of"
+		elog "choice is not included, please consult vim-spell.eclass for"
+		elog "instructions on how to make a package."
+		echo
+		ewarn "Note that the English word lists are no longer installed by"
+		ewarn "default."
+		echo
+	fi
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 1e3909d1519a..6942049668b3 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/vim-core
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.431 2013/12/16 09:18:52 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.432 2014/01/23 10:30:29 radhermit Exp $
+
+*vim-core-7.4.155 (23 Jan 2014)
+
+  23 Jan 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.155.ebuild,
+  vim-core-9999.ebuild:
+  Version bump.
 
 *vim-core-7.4.131 (16 Dec 2013)
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index f9270118ba39..aad76665c52d 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -10,6 +10,7 @@ DIST vim-core-7.3-gentoo-patches-r3.tar.bz2 3379 SHA256 2e0b38221b69d13c43cafb8c
 DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
 DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
 DIST vim-patches-7.4.131.patch.bz2 164514 SHA256 09069afb27ee9996730df5163d016bc286788f7f2b3652e9e4b43a82d697ee0d SHA512 a3db66c2ce9209e986fed70b7775717f96339ff5d4456f546f7c4f8b896010ea01b09095015ed62124e6322218b641a672e33d7c3290d4e4e6b7869554b94fd3 WHIRLPOOL 3918ad4117b087a5aa1c3f076b707cda4d60fbd0398830203b0e92e435d281cab8606d563787a586387882b147bf9948066836423acd1ba0b0a90b86923bb76d
+DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f13c4a165770cef28bb76d8dc7aa630671 SHA512 0667810a1ae908f5739ab37b32688fff3d65c4f69e83d3f9d0364112e8e7f70c77eeae3d672725df25ad837a75e373619321c1f183e7ded67afad544fbdd7801 WHIRLPOOL 829ab6152daed43323af6537669d4c3d6367138d0858c746ba02a6fc15497ef7161c62ccbe9bac7526296f5adf52a4ba1fe86c3539dd559ddc5cb4f6e0f90cfe
 DIST vim-patches-7.4.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
 DIST vim-patches-7.4.41.patch.bz2 72664 SHA256 00eeef3f3f7ce8f2c8ffa163a85fecced465e0a66de3c3cc8963322c8b894b72 SHA512 79ca4b7662c01120471c86d6649904e3d9c68c28958ca96a0548fd3411cb8c678b977acdd4d42977ba6c823efd3e16e765a31a8575c081a32b651b63dfedd710 WHIRLPOOL 5ea5c8a7e08f57603f1c0df43e4e187f60b0a17c5c549999e8d79d8de15365168fd38c5f28fac32af5d57f5869cf132a49171f4af6d4cc769f878207c8fcfa94
 DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
@@ -17,21 +18,22 @@ DIST vim-patches-7.4.94.patch.bz2 143772 SHA256 d9d18940bb3ffb8a16dc443d9cc27709
 EBUILD vim-core-7.3.1214.ebuild 999 SHA256 59b89f0f425d5d2b874c9b2e53323b0e15fda44fdda04f9b6ddf675f0075a731 SHA512 396b2afdd5a86fde201c00cf93b9a9669b2bbb5ae5f3814909d829e86afc7237955434f2e99bd9b2aca73feb462719d0bc91947e0ef33c7770b92e7fffbd931f WHIRLPOOL b97d3e1af7cd481bd69352d447938d88bc7e717fa79f877accab36082f22b5ba7279d50195bab67c0cc1c5c8311646caeda6e14c33f5e1ce9241fbc9278634d8
 EBUILD vim-core-7.3.762.ebuild 981 SHA256 90dc7fe6f060aa0832fb14635707c51bef58dea713fef0e1b475299ece29d3fa SHA512 b413a8c456ac6f1f0974701c05729ecde3ab3919e60b993ed4aa064f20abfbdaf1d556b588e6575708438fd5c94bba0576a5725e9c8346783684166db83f554d WHIRLPOOL 63b8bc9acc28d07a8eb180c5a88510cd59b570d318b24f437a16c32f2430cb3eaf5b3f298734c1e249b82f937c36bd8fa8095154c31f5184b59f2c2fd9bc5261
 EBUILD vim-core-7.4.131.ebuild 7113 SHA256 dcca422501ccdc57f995a7bffcd02a83d7a6ee5a1c82f3ce911603888c413751 SHA512 e379c6a27f3b69db2fca77037f02525e92a1cf2c3d62043a82af29e79cb2dcd3085f22fd578af857d953236245a4d6eb7c2e7799eeda38dec9332694b352d172 WHIRLPOOL a0fdc08d9be7b94bba3d3fb40d48344ed5299a5c501b65fc3ae046c4b6777e866784db5392cccfae8a77c874060539f687d253d98e945cb66cf1228a4f368af0
+EBUILD vim-core-7.4.155.ebuild 7307 SHA256 f89dbd66065f385dae357147ead51ea0d7f9f2437d8ea75a040285c2d53e4309 SHA512 a8ba3fce5317269464eeb1b3f47a61b3e14fc874b21cfcab857cebf4cf605d388cfcf02ff083dfcb83c78ec0853c1b1c34b97dcd24ed67972db70ba64354f76b WHIRLPOOL 9416d033012ade6b0a44dc065ca5a7618bae2c2c707b944402b91f18a2bc0b97783432897dea9ace8f128eb31d859daef00422105b6ac880acc686f503162ff2
 EBUILD vim-core-7.4.22.ebuild 7409 SHA256 a8aa0b82f74302eb98451b97889de668dbe8184dda2b0c00d9a0f3687f0d096f SHA512 90c4af236c3ae849ae5ed320a99d4bbaf81d27b41acc60545e3649d029cb835c747a558be69081fe0768bbc5536d24258aa65ca6a19b033fe0b4b8ccd4d924cc WHIRLPOOL 31b0f6f11b6eaa534758fad1aada144c09707b1270bc1f23c7878df1ea7b571b501b8710829c2d73290cb1212ddaf5ab7985b881645755d957ef518af70d226b
 EBUILD vim-core-7.4.41.ebuild 7409 SHA256 9b1b52c4c123c646dc26c95fc154e607df9c53a4f2ec6deb4f34d53949b25e90 SHA512 9094f498a78cbaa34f9968c381f7e746b66f6dbd39e5f76bc52753f815c4bb153665bfc35c08bb1619639f29724e49f9ff2ac90abf24ae330b786b4d2beef163 WHIRLPOOL 5b9c068617eb74874898e22b195eb9303cd59d9cfce9cf572565dbeb05a1b1c1ef710dee9de2844d82b10425d9bda5af1ecba55c2f57b35fad8738f368c72897
 EBUILD vim-core-7.4.52.ebuild 7409 SHA256 31d591fcce20577af303ef2d7aef6f359a51e28e83880f22a5046245def77d60 SHA512 22b26ec530b9581b1c0617996630dc5f97485b6936ff749cf7459714a6bd077469e68cf334f5dcb412e4a33b2845e8fe260b209631ebc566c5a4c38529b1028a WHIRLPOOL 3fe3c8d1a7e14ff292866961900086f430b4b9eea77c0d69cb2ea03b32fb6c37bb1742a1cc1a10b06a097c613481b8766b587d781d710df2a85e01b04ef9fbc1
 EBUILD vim-core-7.4.94.ebuild 7112 SHA256 7d2cb59201a9ab330c1a5b81e11402ead896e3a966ac1415b930dd74e68fbad5 SHA512 fecbedac0a3e436a611f04ef0fa0ac03357055755b2bfef03ecf4f1e2046641ef650bae5c0587060341122518218f814b734f367b4bb344bba8b186b055a0f2b WHIRLPOOL 25d8be30e2dee6124f0d5c88e2a8f1cb4a25e58687cbc8f48f4f013d86557c83a096ed9e35f84aead747922cd2e60a1a6eb5f1838f68ec0cfebb012b6642bbab
-EBUILD vim-core-9999.ebuild 7110 SHA256 beab4507717fd25230d059376fe84837db2e837daa05d81f9bda8a805a1276e9 SHA512 4f1b361db6a4fd71c1d321eea33b2576e4ffce2dac33bd9a3c8eb38c9f4931a500984b7657af8f0f52ca8fc2ceb21763bb79fd7afcf05ce55a0508d8f39f29cc WHIRLPOOL 296c0b9d20ba27e659023f7ec8d6955c7007b1f17b42e2f745577250c2986ab9a6aa80544e593550f1de68bdf5f15f0cc71a0087628e738e298fe39eb67e9a47
-MISC ChangeLog 58534 SHA256 fba981bf5100875ce25cea50f56545e2c490d811dfbdf2253784f1cd0439dcee SHA512 5ec1477848b283de4b0598775ea8c205496bd2fc9c4e82b84236004fda4b6c4789e98a17a34611722d84d33f923ffa01f350bc0ad5f6ed1c2c0ac399ffb2d266 WHIRLPOOL 2a9bdd7e957a994bcc67852f70ed4a386b3f7070256f20af3b4dcde44fc7b015ad5b4d858a664e2b9647c589e6a8cd7316f7fd0fa533b7bd50fbca1da8fd0e30
+EBUILD vim-core-9999.ebuild 7304 SHA256 ff651d7e0b5b30546f5233fb6130864ec2fee9c9d3bb14756cde7ba1eef133dd SHA512 cffa971170c99efdd8100f219b44ab12cc2027f95943de1e9af7cffe71d00ce452e6082b2e68cb351666dd2aae5ea76db1ccb63b13987624e940b765ef9661bc WHIRLPOOL d488173b64fc44a388545cf76a2c314400866b47bfcafa133b4a59a257739ea48bfae2bd2b6e7752705ff5f965a0f9148013786739a29228a5be9a7ba4266913
+MISC ChangeLog 58683 SHA256 ed2f46b77a847681c9c6cf16424ac70fe7650127f1f2d40e3c7f8ffd21c16955 SHA512 3db5208652a420cbadd5d2be8ecfb29c4950886172adf821b6ed8782da5f4d7cab0d912c92b2a32bf0583187235c225e56693eaeb2af56428dad4c4dfd4af0af WHIRLPOOL b3ee75eb4a0cbfd59c11d7196f9011fbea5e27730136a724dbd5c5a2b28bf3fd1f5d79f77ef8b643ce9c7217955fd384535cf96f09d17b06c9ad94eb343bef46
 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSrsV/AAoJEEqz6FtPBkyjRroH/3Awf2t09kLnRDyHG/LjSKDn
-s404V4iq6LLbDudJ7qzI/sRmoHiOUoVjMA/cTRzZMXuAM+pDRdDPLOrJtaE9/Xfs
-BKAAOowHROLZmS1Hz5kjVXvCzri7m6Y/NlPoY7RyjM27DMB2dvXBXh/Ss2Znq3Gg
-duhyPdZnqsV872w0vOPTfoFMTO3vsBFUW8kXPcHvksWGp/42KZewnqRqpbI3uZgb
-HY4sWcN/T9gj53DGpcWXUkVjlyVUkt9pYZkwSkMSmqlQ7liSYs0eiZ6CvuOdVfiF
-6riR9tkP+w6+uFz12DKN9LUFysqWFgLBVtJKN7TP8J/7BDd5Qqdt9PSAuXrw24c=
-=WfPh
+iQEcBAEBCAAGBQJS4O9MAAoJEEqz6FtPBkyjDP0H/jh0zCfX3JgVmTD4xILxoEvd
+mAnOmYUdWpdpBjL5J0e3eZervYqXRwmNzH2ZdnXVu82CONFjz04zUko13Qt6V4ch
+3juRJb2TpZH4a+x8n9TJkcrXlXbrX5dXF1gfcBos8muTqxvsk2XB62Xco2qix5NA
+7B/Huv3cHul3SClJwae6kGQVU9R1nU4PJLZx4lLdE9yFRQBl9D7lTv83URUYGv8Z
+97NyEofBznt8b7twNNF3lWr6KeTiSq54bgjqNqadxWww8P0iy8l8LMTSlWpHOrgX
+hQRs0BnqqI/8So4PYbTNe30T/iFQ7JMu3jG2zSBd02+dM0F/4bfFJquwtrYy29E=
+=3jT3
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/vim-core-7.4.155.ebuild b/app-editors/vim-core/vim-core-7.4.155.ebuild
new file mode 100644
index 000000000000..6e9d34b130c6
--- /dev/null
+++ b/app-editors/vim-core/vim-core-7.4.155.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.155.ebuild,v 1.1 2014/01/23 10:30:29 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/${PN}-7.3-gentoo-patches-r3.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="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}"/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"
+
+	# 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
+
+	# 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} \
+		--with-features=tiny \
+		--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
+}
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index a41a45adc66f..10a571eb74d4 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-9999.ebuild,v 1.5 2013/11/19 10:19:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.6 2014/01/23 10:30:29 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -47,6 +47,12 @@ src_prepare() {
 			# 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
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 380ee599382f..e6e96eb09cb8 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/vim
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.450 2013/12/27 22:06:19 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.451 2014/01/23 10:32:21 radhermit Exp $
+
+*vim-7.4.155 (23 Jan 2014)
+
+  23 Jan 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.155.ebuild:
+  Version bump.
 
   27 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/vimrc:
   [QA] Remove unused files. The vimrc file has been moved to app-editors/vim-
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 3faeef44460f..36fae1bc6e31 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -10,6 +10,7 @@ DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a
 DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
 DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
 DIST vim-patches-7.4.131.patch.bz2 164514 SHA256 09069afb27ee9996730df5163d016bc286788f7f2b3652e9e4b43a82d697ee0d SHA512 a3db66c2ce9209e986fed70b7775717f96339ff5d4456f546f7c4f8b896010ea01b09095015ed62124e6322218b641a672e33d7c3290d4e4e6b7869554b94fd3 WHIRLPOOL 3918ad4117b087a5aa1c3f076b707cda4d60fbd0398830203b0e92e435d281cab8606d563787a586387882b147bf9948066836423acd1ba0b0a90b86923bb76d
+DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f13c4a165770cef28bb76d8dc7aa630671 SHA512 0667810a1ae908f5739ab37b32688fff3d65c4f69e83d3f9d0364112e8e7f70c77eeae3d672725df25ad837a75e373619321c1f183e7ded67afad544fbdd7801 WHIRLPOOL 829ab6152daed43323af6537669d4c3d6367138d0858c746ba02a6fc15497ef7161c62ccbe9bac7526296f5adf52a4ba1fe86c3539dd559ddc5cb4f6e0f90cfe
 DIST vim-patches-7.4.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
 DIST vim-patches-7.4.41.patch.bz2 72664 SHA256 00eeef3f3f7ce8f2c8ffa163a85fecced465e0a66de3c3cc8963322c8b894b72 SHA512 79ca4b7662c01120471c86d6649904e3d9c68c28958ca96a0548fd3411cb8c678b977acdd4d42977ba6c823efd3e16e765a31a8575c081a32b651b63dfedd710 WHIRLPOOL 5ea5c8a7e08f57603f1c0df43e4e187f60b0a17c5c549999e8d79d8de15365168fd38c5f28fac32af5d57f5869cf132a49171f4af6d4cc769f878207c8fcfa94
 DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
@@ -17,21 +18,22 @@ DIST vim-patches-7.4.94.patch.bz2 143772 SHA256 d9d18940bb3ffb8a16dc443d9cc27709
 EBUILD vim-7.3.1214.ebuild 1118 SHA256 5f2562a86a39ba99c79baf0b44173aba00e20013e249af74777ea9ba4bfaf751 SHA512 514233dab534cc49a4f318681e568ed059128352e94d748e1b38632340ed4576f6b0218367bc28024ec689e613c9fe180872054cde6e83a164227eace5568dba WHIRLPOOL 421d998ef49148b7efc77830126c8c2aa2eb7c2b0674752a24e60de289c2588f5b426847f8bed35951410c906d21c6b0d5fc9f814d81b5b8c1ce12277f3444b5
 EBUILD vim-7.3.762.ebuild 1001 SHA256 17cb878cf1c5922ac95d2d6c04215ae1bd695bff7a4ac742f92fbd0a8d688829 SHA512 2c7dbc515e74af5614e9a3290f61adb270c6f4dd0be4795f55a35d9d723c2bc7f3af4b890b571c21962be6585551b685dde68d6c1838368af7a1721ec87c1219 WHIRLPOOL 2a17ab2e9a9e903f1d2792d29d39086a8d3eb42c55683a409c6a6025ab2a5bbe1ca3750b5ac815164b293a6ecd59d187c37558e084baf66b4b6818d290800325
 EBUILD vim-7.4.131.ebuild 11525 SHA256 402a294b5ade9b10ec78f131be36fb8dc545b946b17c41ffdac17e8b270bddb3 SHA512 c15892d0208635f517c46d4744989fce94c507588329096b7c6abcea7f33ff5d5a3eceeb0e3202419dfed391340677e7097b14236a01f9913a2ad9f699285df8 WHIRLPOOL 9b75931c1a526cc648a9238fe97dd56e8e628ef832b607ff72cd22d3df94e8b73e8ca35ec0f05fa665ae90a4097b5516611014092eb2f00fa7e12d74561c3ede
+EBUILD vim-7.4.155.ebuild 11525 SHA256 a5ff17318686529f80eca4b8814776f8ef36b5aae19e5591788a6d7418dba50a SHA512 3f6b113be76cb45343e46eae6fb81cf86a023412fc3c984c3446616868c8e387caa640027929bb3d26829d381f938f151d70fdfa7c884fc311781bd91be7531b WHIRLPOOL 7e547fb61f4b73d40151f130c0c5a2eae0075bf07133abb17264c288c1bf7f25df61000620eff26c79f6e91bf2fbe372a12d096ed5ea6dcc69a81b32d8509d22
 EBUILD vim-7.4.22.ebuild 11685 SHA256 4e146f3f1543790176d4a4599c8cc5131424a381ce5e09708122932f439d067d SHA512 5e174be65ff70bde818a6d9b10fb721eb93d4c7a66f9b34acd77c260ca076960c3e999abcdee7ef1077756f97b7ef7bc1ee52a01da695ea6650b03d6a85bada4 WHIRLPOOL f556596dd8c4311496d6d444f3695e460e9c48b299ed7a0d9bb7ae7acd3b7f5852a85beaa0ef25da9d26c6c7df3cfb6622c103bd7e2ace9fbe5283da1b3f950d
 EBUILD vim-7.4.41.ebuild 11685 SHA256 3977ee1e5cbbae717bca43b0c9f216576122189563accdd229fc7c7df915d894 SHA512 32fae016d1e17147adb762479feefc83df0ab398f5e18c20ab5a2a9ef6af84d7176a27ec8da305bcc57290dd2a1236ae21be71f1b5fab208b842c23d1745b2c5 WHIRLPOOL b07ed4e458db3fa01e3146c8f0b5fbeb01329a212124772080ddd44c8d97694dd219018d4c6c95dd178efa24df25b88d9ca6e816d30239b69ea03104a391825f
 EBUILD vim-7.4.52.ebuild 11778 SHA256 6c966f4d425286610619b546ea787222b4fdcdb619eefc017cc041c7eac16db9 SHA512 a4f7af2a712f6ac7f254b62597a25ce3b4e269d575531eae85df9d34fdb5315ccba8c1b5946d4eff210d3acc82781040f7309a176b79f25eb6886bf94bf0fe77 WHIRLPOOL c1e4bfa5d5ae42f9df88a237903190d7658eaaaaf37b05c5b4addbc56c3064556ba630e923a1b3037f5f7800b35287ce6b2cc2bd800099e079094b820e749545
 EBUILD vim-7.4.94.ebuild 11579 SHA256 12fcf887c75572ad03c79e96d4dc46bc665897bcf5905b565040648e140fdd9c SHA512 bb415b9930623855e03a2f2a355dc4034a1e55ff50efa8aaadffdc0fbfef15ee887bd6a9254d4160abd9b6622feb0db12c979e24da16eedb2276c3702438f190 WHIRLPOOL 68e29a5037699fa63798fcc9570bd07ffdd12e3288f4bdb6a50c2454af80c14b220f36b88808151dee3dfb236e97343617dc5352805c7eca17c8dc600ebea492
 EBUILD vim-9999.ebuild 11522 SHA256 9423d9f0bc8acd782369bb80234d6ae69761c764cc42288140ebcd4b0983b497 SHA512 46007156879aebfd269b1b84a57b15c73b48482a62c87697c9cca898958d398e36a87382eb2a2577ad5b417a5494eabf193182cf8c79f9c1068011b1ada26f1f WHIRLPOOL 40eaaa28265f7a4743e18f2672afc10e8f14faa084d4d7f3547d2f927548f8c31c729ed7f41e118973b6d96e5f7fce171e5da0800f6b67832f3b686b057819a2
-MISC ChangeLog 60727 SHA256 e9135153b3fe6af1341ad1059c10d69f985e567baaad16778a55a2a3dabed174 SHA512 540b0d38f74a1353dcbeb2a8dfaff681d35bb3bf828069de2e64a84230d63e5a2138edd86638aa5eeba613d87f94b5fe7a449331bf884d51ef3f77858289fe0f WHIRLPOOL b4eae397f08d85b0ed25f6f1dd73521464d1cb962fedf486df9af5fd02d5bfdc3c0e359ec39f21863c37bb97a5c558eb53db97852b1fe31f3712dd17078d8237
+MISC ChangeLog 60845 SHA256 8d04504c80925cd24402c724f62cb6755eba76b5df6cf1caa8126232a3933f80 SHA512 e8204d0da89392ad13e102ddc0266467c92028bb05bb4a63a326d6ac8af776733b67725f20e5ad30978b5276574a970eb572d37c4a3a831ee99ac727e517ebac WHIRLPOOL 416ef36c893097b143aaf45879c02697e52ccc2bdc3b5a0a65614fb9159e4dcd44731dec3755227780a412dfcbee2b067a11f901251cff3b83b7c5d604f6e4a0
 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSvfnLAAoJEJWyH81tNOV9jFMH/33swjKaCAgBGWyoPE0A+UVc
-wQmNez5sE+sdgKW4WGbSVNd8RCvZyXXsjDndfcoOcWSLB3rnGFKADOTP4DVDy93g
-2ZkAudgBUWELf0NnASb6qJXBqakkoogZ0WyNh6dvf0WXwvkaLqqdk9gaRmZgT1JG
-mUR/WRD2BnYZOl8KnBJXTQx2kOJfc9OxzHO9lX5FnCYS9FwW5Qi853qPO3PiS5o0
-Uf7KXH2w0HvSDYfPtwjE24AYXel/hiiTjiI8aS4tBCLx8DnFJ1o58ZHIy32Mtk9m
-JjBF/gy8JPdtPYo7SjqjUZmR02gNgSRQ52zcJkOYrrSkN5/rinFs98PxGtb6JRg=
-=jmwc
+iQEcBAEBCAAGBQJS4O+2AAoJEEqz6FtPBkyjL6YIAJS7TOLVDGfvmDeVruHyRjwg
+a107C8NgXxFZcRNUph2RwQUM1QoyGIRCx/MeAPCBT4RfaRugJIPnM6W/Cxgjy0sm
+sJDUprHdlAv9NL3K+3pQ77ntteOYuRJzx8emlpr04w0isDR2z2biFSGsi+NJFbtZ
+1KuQrlD4sIlL6IM5uWl9+grdZAxW6UNi8v3BK3TSNQlwgE9XtQVWJDNtaTuqQhXg
+xUHUnOLxsSt0x/hbpmQOF5KaTJHiTXY2gqfB8tua6kZZDdNl+yQinE30vqwtcez3
+wHgtHkQGNeKwPhDX5l/jjkjVhrdWxsQHV9hsm0FPSOSmmq4qBsFKmYBul8Pzh6A=
+=zimV
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim/vim-7.4.155.ebuild b/app-editors/vim/vim-7.4.155.ebuild
new file mode 100644
index 000000000000..576694d4d3ea
--- /dev/null
+++ b/app-editors/vim/vim-7.4.155.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.155.ebuild,v 1.1 2014/01/23 10:32:21 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 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 ~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, an improved vi-style text editor"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
+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} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl )
+	X? ( x11-libs/libXt )"
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-vi-1.1
+	sys-devel/autoconf
+	>=sys-libs/ncurses-5.2-r2
+	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
+
+	# conditionally make the manpager.sh script
+	if use vim-pager ; then
+		cat <<-END > "${S}"/runtime/macros/manpager.sh
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			END
+	fi
+
+	# 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
+}
+
+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
+
+	if use minimal ; then
+		myconf="--with-features=tiny \
+			--disable-nls \
+			--disable-multibyte \
+			--disable-acl \
+			--enable-gui=no \
+			--without-x \
+			--disable-darwin \
+			--disable-luainterp \
+			--disable-perlinterp \
+			--disable-pythoninterp \
+			--disable-mzschemeinterp \
+			--disable-rubyinterp \
+			--disable-selinux \
+			--disable-tclinterp \
+			--disable-gpm"
+	else
+		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 lua luainterp)"
+		myconf+=" $(use_with luajit)"
+		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 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
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=" --enable-gui=no --disable-darwin $(use_with X x)"
+	fi
+
+	# 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} \
+		${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
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../vim 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/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	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
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		if use X ; then
+			echo
+			elog "The 'X' USE flag enables vim <-> X communication, like"
+			elog "updating the xterm titlebar. It does not install a GUI."
+		fi
+		echo
+		elog "To install a GUI version of vim, use the app-editors/gvim"
+		elog "package."
+		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."
+	fi
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}