Remove old.

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

12 files changed, 39 insertions, 2039 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index f6ddaea0b8c4..89c639748b0b 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,10 @@
 # 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.411 2013/09/06 07:32:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.412 2013/09/06 07:33:46 radhermit Exp $
+
+  06 Sep 2013; Tim Harder <radhermit@gentoo.org> -gvim-7.4.ebuild,
+  -gvim-7.4.5.ebuild:
+  Remove old.
 
 *gvim-7.4.22 (06 Sep 2013)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index b20609310fbb..a63c866c5dbf 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -14,23 +14,20 @@ 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.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
-DIST vim-patches-7.4.5.patch.bz2 4352 SHA256 796b8d4e1b758d83a939118d3ab2d8c7ccc64671e41ffd16c723f6285ca447f1 SHA512 6e4b33de2b61d2a451f71d40d8ffce1eb5ab8dc379db96f93a36efb2789300524ddb9e9f8e300dfdf8881ba095aa94e701d9530e9a650e994d6e2d0d35531600 WHIRLPOOL 6a2a15845d7522a32b313161c3d2edddfdc41c5cc9ae8b20e9eb3e3e958173a8a34ffd0775f0bd5675d5bced8b4d680b3023e13c32f3fc2d73976a8b8a2ce839
 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.22.ebuild 12589 SHA256 5b428e82e93cd63e569abc67b70b2ef01a26776b69a18511a9d0df611ceb789e SHA512 e3c8de4f731129a99dbd7c19a7bf23f419fceb59d779a10736a9658d5f5e80d019f98b288c45dabee573cab9923fff2a85c65c8c1083b1a958e0c3b374449f5a WHIRLPOOL 40e592856a49faf550d9fff887a5806856f47e684809b17bd5fbc5281a991acd75415fa6c84d3914a58a3298ca616456d6b522c0998c203762bfb1a38680e7a0
-EBUILD gvim-7.4.5.ebuild 12510 SHA256 4765f45615d997abc2901103f347982bef44ed686b7ad5b9e37fc5536d9c75ca SHA512 4c7802c02d0f5837681e6777597b1301d70ebbd36ad5b85607e6814407f516a2577b03289c6774e8aca4c65404accc27c72bf2de508f019b41886f5ff4370fbb WHIRLPOOL 02e701a6765464dcd5c6fabd4e2a0e4144269859a725b8a2cdd35c3f3088945ea8fbb471f533a674fc3ecfecd3631ab31ce72289795b29bd44b1e0fe395925d2
-EBUILD gvim-7.4.ebuild 12510 SHA256 5c85cb27a472fb10effb9ccbd869c5ac86af1799d22abf18ed9e9a61ab929ceb SHA512 ef8c70ad4c1c70fe9467c44838376d7482b7421edec46c49f6d5316f923f3f30a44197bbaa6611ad3b7e67a7a4d3513a9e06237e8668f05281d8e7e61f74fe2f WHIRLPOOL 0e08fd3deea82d2f0ae2e41ae45cdfd2082588d261afdc809aa4f42b99a029008c10d89538641587f7748bd4efed78bb2d0b791ebb219707bf9adfebbcd0ea2b
 EBUILD gvim-9999.ebuild 12587 SHA256 1e70048f97fdfd05802f7f6ae3a4e41f11a017f869597bb7f14c34d195729872 SHA512 56f86f537d811c1380d2712d48839187b2ee1ff13daa0f9bbfe29a6392245f7d52cff16932894733395623b9875165ba7040ff4dff87998a98a2ffcfe34fef58 WHIRLPOOL ca97ca2b17586a89ff57e7628414dea560e52c3bdf0023efc93b8adb9e04c3491d80bcfcebbcee19dc198ed041e9e644a16235512398dd6b0da5c31c0f3b0627
-MISC ChangeLog 56064 SHA256 12d70bce04e3dc3127231dff3386ab6cbc16d13970ee47894812866e6ca6da09 SHA512 7f008e48ce862f20e5bc42f555c7f9b8a5263328a22a0f8f7a9e517977167405e2cad4841c8277d02d636424c856f5fabeb97e65ead980fbdecd9103a4a24a96 WHIRLPOOL 0e5b0f2ad47c7d87f809f2a0b946f7916d569fc8c41ba39dddf52c5077c618fecb1e0b2188cb52a1907045f72704a545e48cff8ff0a294e5f91092f5d4105bdf
+MISC ChangeLog 56168 SHA256 6d5c0a52cbce046857dfa5f0daad0ceac6bd7779602aa3f282e95c11cce6b778 SHA512 f7d9846d9397c94059c59a2b820e398c7e9bc214d60123139d24bf4e30a51fa220c68f8af587c876915f9a433cfef255bf695f63755d5a4f35a03288208f0952 WHIRLPOOL 3bf532b2ac2a46f43f9e694690ef48c6ef3e952e22d6e0af24830126f9597f91e228463581497703aa340af02cee1188a38d2ad72918ffad6f39d1c49183713a
 MISC metadata.xml 348 SHA256 e84bf1fdb970b616d6b2fb17caf3d3f75c276e52430c58e447f8a4dbbfd60777 SHA512 619abbfed97c2bf11f32ea519ba3f0a4a7c388723e6e60fc435fef7487fec143d4f9d492281fda9fd5b2f319afc3d89a7bc21aef962038296e0e13a23ce7229d WHIRLPOOL 0d72852f58d2a0682266ab99a5582112bd95588f781db5bec3d319d5cf1e9b54ff583a622047f5cf23f4165a83b591511cef01f510314710d798d8c688de1e98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSKYUXAAoJEEqz6FtPBkyj75wH/0ytchsAWBpvT70hRxzjbfLW
-/YtYEbw6WnxKpyb3W3YCsSvo5VxEzf4d8lmJYWfZuvEZWxnf4hwjTwWp03ZckpO/
-/nyu7sp4EcfVLCQ1Z5vJBjIsTxiAR4x6JXqPb2UjUqN6ILoGL5fdAr3qzMzcooGJ
-XdZT0F3X71GgQ2CY2/K2bAEr8NXHmxNCdQ0JsFxElRoFIQpuBkMMbdgLKerOsXeM
-pmR3HoL6J503v+qLftwaRNLgv/W5/LylDIZS4NSywaec+NIOej+F5Evr5RC061OG
-kjgXov4LlekE5zDGVZ26WCKxmi91ZtTr8ok2uddZmS+F4ZpUeRbDDu4lNIVQo8I=
-=lM3j
+iQEcBAEBCAAGBQJSKYVcAAoJEEqz6FtPBkyjO1YIAIvoFjQQ8IP9zxu3OVsUvbnM
+1ftRgWSq8bP4qsS/ucnpy2lzoVbwaxCyhgUsq6PDvVR5pGYhRVjDiiOcjbpzgQ1I
+j11ZH1m1iwtk6rQerwi4n6hIgF9lWo8ZNBma5M85cjl30kKQlWByZCZbei6gZcO+
+cosy/TX/mN9i/f9HWMvBn2aEMeyegYUzpxKnPGCVpyIkgPVeUVx1BVx7BnDuNOwi
+kp1gPgfMuNReXp8/ZOdb1mTSi4vNXAx4mO3BTnWKdF54t0YiHhzB6gUMq/ZuKRxH
+gYw72iRjFdHh59j/mJNTp2B7gpgDUedYX1zGW/DkFteuLue+3Ljp6Kmc0NMyMPY=
+=ua3+
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.5.ebuild b/app-editors/gvim/gvim-7.4.5.ebuild
deleted file mode 100644
index 435a530c304e..000000000000
--- a/app-editors/gvim/gvim-7.4.5.ebuild
+++ /dev/null
@@ -1,401 +0,0 @@
-# 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.2 2013/08/18 18:34: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="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.
-	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
-}
-
-vim_pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	fdo-mime_mime_database_update
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "Vim 7 includes an integrated spell checker. You need to install"
-		elog "word list files before you can use it. There are ebuilds for"
-		elog "some of these named app-vim/vim-spell-*. If your language of"
-		elog "choice is not included, please consult vim-spell.eclass for"
-		elog "instructions on how to make a package."
-		echo
-		ewarn "Note that the English word lists are no longer installed by"
-		ewarn "default."
-		echo
-	fi
-
-	echo
-	einfo "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
-
-vim_pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	fdo-mime_mime_database_update
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
diff --git a/app-editors/gvim/gvim-7.4.ebuild b/app-editors/gvim/gvim-7.4.ebuild
deleted file mode 100644
index 9f6624c94dfb..000000000000
--- a/app-editors/gvim/gvim-7.4.ebuild
+++ /dev/null
@@ -1,401 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.ebuild,v 1.4 2013/08/18 18:34: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="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.
-	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
-}
-
-vim_pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	fdo-mime_mime_database_update
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "Vim 7 includes an integrated spell checker. You need to install"
-		elog "word list files before you can use it. There are ebuilds for"
-		elog "some of these named app-vim/vim-spell-*. If your language of"
-		elog "choice is not included, please consult vim-spell.eclass for"
-		elog "instructions on how to make a package."
-		echo
-		ewarn "Note that the English word lists are no longer installed by"
-		ewarn "default."
-		echo
-	fi
-
-	echo
-	einfo "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
-
-vim_pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Update fdo mime stuff, bug #78394
-	fdo-mime_mime_database_update
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index d8a56faa8475..ab890fb7c8df 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,10 @@
 # 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.426 2013/09/06 06:20:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.427 2013/09/06 07:35:49 radhermit Exp $
+
+  06 Sep 2013; Tim Harder <radhermit@gentoo.org> -vim-core-7.4.ebuild,
+  -vim-core-7.4.5.ebuild:
+  Remove old.
 
 *vim-core-7.4.22 (06 Sep 2013)
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 58344872e592..acd4a6c83e61 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -10,23 +10,20 @@ 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.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
-DIST vim-patches-7.4.5.patch.bz2 4352 SHA256 796b8d4e1b758d83a939118d3ab2d8c7ccc64671e41ffd16c723f6285ca447f1 SHA512 6e4b33de2b61d2a451f71d40d8ffce1eb5ab8dc379db96f93a36efb2789300524ddb9e9f8e300dfdf8881ba095aa94e701d9530e9a650e994d6e2d0d35531600 WHIRLPOOL 6a2a15845d7522a32b313161c3d2edddfdc41c5cc9ae8b20e9eb3e3e958173a8a34ffd0775f0bd5675d5bced8b4d680b3023e13c32f3fc2d73976a8b8a2ce839
 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.22.ebuild 7409 SHA256 a8aa0b82f74302eb98451b97889de668dbe8184dda2b0c00d9a0f3687f0d096f SHA512 90c4af236c3ae849ae5ed320a99d4bbaf81d27b41acc60545e3649d029cb835c747a558be69081fe0768bbc5536d24258aa65ca6a19b033fe0b4b8ccd4d924cc WHIRLPOOL 31b0f6f11b6eaa534758fad1aada144c09707b1270bc1f23c7878df1ea7b571b501b8710829c2d73290cb1212ddaf5ab7985b881645755d957ef518af70d226b
-EBUILD vim-core-7.4.5.ebuild 7408 SHA256 33e05e8956f85ed9620750b68ef687de08dc4a47fcfe088557371b824714554c SHA512 51b004a6cb5e7ac770e70c8c330e5befbf00abee41fc5b8a6d75fe3f2861d4123d0a9fc95ca798a3ad11ec7edfebe551834ec671376745c04433d6829ad79942 WHIRLPOOL cedf2e2f28571b34c21275fce63dc5cb39cb3a52c1d48acb86faa53271fee54ae530d97c7c8ecbc24fd7621cf30122a9f39adec2198d87b6ff579ff746f249ea
-EBUILD vim-core-7.4.ebuild 7362 SHA256 b686130f538c155e4db89763c2c28351d5ba2b9d6dd3a7d64d5a6e45727652e2 SHA512 c36616a3c1fd3c2abc10fc965b921889e5b40514a87d9998d5a3b9c1bd55e1b9f9a7158669f2ed793a58e74b69cdb194acced99a1e9656dfeabf93be4f0df415 WHIRLPOOL d8c79b2e6f1c27a82dcbba4ec659c5add41399a989dac881e77f7f8ba831f7879a5d4b20b0c31736ffc14023887241454365a1179b641a7ea65454e63bb4a9a3
 EBUILD vim-core-9999.ebuild 7407 SHA256 4fdb4a730220575c8503af2a52fb5cf4c45cda56103730d008d76e469eb8981b SHA512 d5dcb7cd4c3f3b46b0259490e8f5319727bc78f48093cdd4404285d9166f8d91e74caaa6aae01dbbb08d8a42e6231a151eb588f16bf3a007b60d8f94eabbd51e WHIRLPOOL 47cf5701ad45fe9c984ebaad235d74f7db233d59c24dc0c48c48295462a59c28467c38c9378276d3752bb0bd72aef5eb2084f3f6fc040302a69a3146c13bd9e4
-MISC ChangeLog 57904 SHA256 9f742062b372828fd5ed9f294982ac6b02511443815ddb6554dabb9619a9edac SHA512 e6cf3a41f096edbfdc33fbcf47ec70a0c7591269bca5c53dd2bf6197bf5e0580f077a0e6eed3575fe0f63dea30431fa96274ef4de970504023a5f7c166e8cecc WHIRLPOOL 018512f3c70f43ff31cf4d470c4e5a44a9bedb44c5c4831f456bdb56c2e84510762190ae8ab286b4dae9d15ff8b0d0def49c9ea4ddd64e77b4deeb526cfde73f
+MISC ChangeLog 58016 SHA256 8ab7ea291cf93a7baa069664ba780b2f3a35fc5217c990891efec70003ce031b SHA512 f1c34a5812f5b87f9814a139547db006d4f9fb2af1f81566754474fd3202fe802962883ecb23c1a1e92ac745c67f9939414034606950aa8d4c98b61322baaba6 WHIRLPOOL ba707948d33d501056748c19a4e76f216784df8eab96bf1941febd6a02aba4bc7e38be546053e78bd219cda544b966cec918be6ea7fdd23bcc43cab57887f48c
 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSKXQ0AAoJEEqz6FtPBkyjsAkIAJvVdcoR/9FCPDJ+vyXRTdXq
-/neYNNLQIgmsWDK9lgkf8M8xwXXXuMzR4QoAN1gmSQfixIyYsP0AWe4ALaA7phy7
-+VTI4c14TbgynlcSK4oEHHuQifqkXBNZn6A/3nxA0DeZPhP1cYO8FHWrKNU9ggiN
-cv7Qph2hVhg9qVQff6VFaJgDS0aOi4IjgLKo8+/CJyaK8vhlDimGwIfEm1IkHgLt
-UMFoNrvCf4pezwYpyHuScHLOg2oaMHDtr3p0zXa4biPvgHUMasQKPS4oj1incCqy
-vemT2Rq7uDXLm02XJGv81kzasBch9djyMAS26ILBK6+fnthnAuNFYYPDBFWk+2c=
-=vlJJ
+iQEcBAEBCAAGBQJSKYXWAAoJEEqz6FtPBkyjivwH/iUjbdGWGLeQfXQh2VMxe7Pn
+57axdUYGhXL+c72AjsG/gGsFJC5yyE1TvZYNvlGhA90EGtmsqKgHnSJ7JdHQWNP0
+pG4FoBoIyNOlM7Cq3fDT2WiAdl5EGKGY37TxTpQ9eKHg4wi3QJOflwZIfnJz8ix5
+F1aELsIU94z7p2JUgUzg+FMPCQl2+Dgb6kwy3a01JNY5sT5JBAF524LhrlDC/IlB
+9YkSsYQjo+wKESAf3SD9zyt2VemVt+2nUCoAX6CTI11BB/1z3GlGRzditXHlcJj0
+Hu4z12Nul722uGBacyKsdE3j48qc2+y8doP3iDr1vy1V01KJElON1uaF3+1shbg=
+=EQC9
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/vim-core-7.4.5.ebuild b/app-editors/vim-core/vim-core-7.4.5.ebuild
deleted file mode 100644
index fef67907f4a8..000000000000
--- a/app-editors/vim-core/vim-core-7.4.5.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2013 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.5.ebuild,v 1.1 2013/08/18 18:12:03 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"
-
-	# 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
-
-	# 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-7.4.ebuild b/app-editors/vim-core/vim-core-7.4.ebuild
deleted file mode 100644
index 52df293d2e32..000000000000
--- a/app-editors/vim-core/vim-core-7.4.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2013 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.ebuild,v 1.1 2013/08/13 21:51:54 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"
-
-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"
-
-	# 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
-
-	# 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/ChangeLog b/app-editors/vim/ChangeLog
index c06e12da875d..9d5e31cea443 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,10 @@
 # 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.443 2013/09/06 06:45:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.444 2013/09/06 07:34:51 radhermit Exp $
+
+  06 Sep 2013; Tim Harder <radhermit@gentoo.org> -vim-7.4.ebuild,
+  -vim-7.4.5.ebuild:
+  Remove old.
 
   06 Sep 2013; Tim Harder <radhermit@gentoo.org> vim-7.4.ebuild,
   vim-7.4.5.ebuild, vim-7.4.22.ebuild, vim-9999.ebuild:
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index f36ee8237e46..82d6b06f166a 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -11,23 +11,20 @@ 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.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
-DIST vim-patches-7.4.5.patch.bz2 4352 SHA256 796b8d4e1b758d83a939118d3ab2d8c7ccc64671e41ffd16c723f6285ca447f1 SHA512 6e4b33de2b61d2a451f71d40d8ffce1eb5ab8dc379db96f93a36efb2789300524ddb9e9f8e300dfdf8881ba095aa94e701d9530e9a650e994d6e2d0d35531600 WHIRLPOOL 6a2a15845d7522a32b313161c3d2edddfdc41c5cc9ae8b20e9eb3e3e958173a8a34ffd0775f0bd5675d5bced8b4d680b3023e13c32f3fc2d73976a8b8a2ce839
 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.22.ebuild 11673 SHA256 8ba58f6883183e018035c28b626935ffb3da62ab8cb58eafc5e726d59dc52e8c SHA512 8ddbe36358260e17b217c3700ca51e6a224032c1ac60c79bd5f863a3c2b46c889468d2acf219504ac2540d5896579a92bb668e1d667c4c7f04d93849639faad1 WHIRLPOOL 994b86ddfd54dc2f0c870499c6eb5ad45e669c755ff391137d2b3ed233c8ce255dea4e66e79af8f0dfe1c75dbf7bedafc4fb032fed083e6d1d97b2bede2ed33f
-EBUILD vim-7.4.5.ebuild 11672 SHA256 055b55c5161272408a79fc2df4c9672f33c0dd20edfe0fa42ed01d2198c03b0a SHA512 9597f8870944061c7520c3fdd39199b22f85097ec9d1104d7512590ba62e4bfec69ec8a1222eb3c3c3a9267dcb83dec4dcac3a6a1a1bcd95ac21e91f7d5e7393 WHIRLPOOL c6f3885acbe12b82e0624a9e7274a280de91e146d03c297cb4badaa9b2ac38aff3f1dcb04f9c81f3dfad0bfa3b97224e4e1ef4b415f69a9cfd323b475d8721d4
-EBUILD vim-7.4.ebuild 11679 SHA256 9f765729e10c5dd1540bf5e0d44e02db0bc608d07282f132c1b6c75c9d6d6d2f SHA512 b42b49eb5347e1ac299707c276afecfebc29b6b092a3425b4f6a187855c43962111639da4d377030ba3e8416ff304b2b18b750fa161df74adda550504e1dfac5 WHIRLPOOL e9a98dbc7666d1c5e6bb212dbea1962000e8d567f4f7841293c96bcf662f7ef45de03793174c578228c03dafdce9f8a43398ceb5f0c6744850f392969eb19f8b
 EBUILD vim-9999.ebuild 11671 SHA256 03915add15a878f9c2854c5376f8c75fb996cbdf80b76461037e23706c8424c4 SHA512 b083b0d15502c3131c44eff57bedc4d1adde26ea5d26c02794f33ebf3c583f8fcda0910e68b4d75a2888e6075e751c27f4a5ce03cd4a946e9547894efc7dcc29 WHIRLPOOL b19b9a8ad39839948a4de330823580153b887f56b005ab82451149552fa82726559deb00f350a4cdf84f84c3329732acb13504d51b24b86bc671dad105d16bb9
-MISC ChangeLog 59663 SHA256 dd794886a503b9f8019f8fea79503bee18d87b0b60cb3e3b874b146bd0f6349a SHA512 ecde86f5723ca8c5e6a685be5a33e1dd9e957985bc65cc69df140f61f34631f105ca201c6dcd88975964492d5e27198732b2a1d90a1c0c67e30774cc2bc008f1 WHIRLPOOL 86e3a199a4c5228b15daa1e91311a02a66993e71c7a88406a1bbb3674defd85d712a609a848dd0609abb610808527bf4c776becea95cf32ab4b486992d90a4de
+MISC ChangeLog 59765 SHA256 13a01b413df90934989ba1a22d4dbda2a14f558f595471ba8e4301868b9ad0e8 SHA512 1265bf6af16be66f5b99f4d2d96247ba49779ade137b8b6c71733fc1a83533766a9033002147b4fab0b253a23a527b729da52cb6077fc4dec7211f6559599293 WHIRLPOOL b12360f2ae9f92d12891f3d7c11e28f0e85719ed3bea2457046a12225be90c43fd6f59f25a3098203a2de86f43180cfa800515e1786a7d161558854291b719c3
 MISC metadata.xml 523 SHA256 b75a53f2927616d5ceb6fdef13bc77f5852e80d4dd0305c52c80c3b6999ba83b SHA512 a649323d51eac150924004665e99a2c99b2900524773a3a6a15e3fef7b856f6c6c2d0efd8e2213e202eb66a28432a171dd62346be045faa884e72a1a78ce8338 WHIRLPOOL b99bc6b2bd37665a8629f647b528473734bddd7f639e66e8213da75452822e3177273b23ef5be2b76a28e46216ce42b398d3d4529dc724e95049477f920dcd70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSKXolAAoJEEqz6FtPBkyj/loIAJG7jx0RXbFjMN8Bm6y2zG5H
-AmJZlhFkxO5c4uBYqE1+hXocLXm3HvmM4gyNpfCmUprGil0+ISuXQNKAhwepAxME
-kuAs1FHkkZwfzzRbVsQ87MkRxKuM9o9FjOAuwJKCfJWJUyYgjscBsx1TF3P+UTDZ
-wtmA4dCuOuvm+R8LYXHwDsIHlAtBub7AhaaSMGT9o671bxNEAYBnslM8S3GxFV0Q
-RX4oRPpI1ynk7ol2TJbuOMRwBnei4CMPuEGnJvuJUQnkuC5Unw2CNY5oAUhdRr5I
-E2s0GPMerXaWimE6ZrxjKfcwpk2NTfs9TtMFhnBESDX4L+280o1fsFDM2EOI9+k=
-=xEKX
+iQEcBAEBCAAGBQJSKYWcAAoJEEqz6FtPBkyjD6YIALpKCfujwe0qG7lvOL6FfKk3
+AHV9UA8fxMW7ouBcUj4TuxfiM2YcoE2IGPTdluwxONQ+lwSH/p2kSwWMepvOHzQa
+kmoV+1WvlQoL/Gzsya/g7gziPmdLNJiqmP60Bk1lwrdLcvJ6dOdPcCNj4oQs47E8
+pdI9wiUTs8SFYEzLb3TMeXacQZeKR9kallmzaC0RtrSg7QsElL6qpp4SOPzHibVQ
+cpiUSfRbgjns76/1DnIgkhFFvJ8HI0yfrCtHZQLJADSDVf73lC3y6tbJTKN3bamD
+FkE55IS40eCsh7Ad0YKLWuU6+ZGvtuP+3hx6yU/icImz4iDqP8uCflNzwm/URMs=
+=Ci7C
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim/vim-7.4.5.ebuild b/app-editors/vim/vim-7.4.5.ebuild
deleted file mode 100644
index d6164f938367..000000000000
--- a/app-editors/vim/vim-7.4.5.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.5.ebuild,v 1.2 2013/09/06 06:45:52 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 and gvim shared files"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python ruby 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} )
-	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
-	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"
-
-	# 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
-
-	# 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 -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
-
-	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-rubyinterp \
-			--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 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
-
-		myconf+=" $(use_enable lua luainterp)"
-		myconf+=" $(use_with luajit)"
-		myconf+=" $(use_enable ruby rubyinterp)"
-
-		# 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
-
-		# 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} \
-		--disable-selinux \
-		${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
-
-	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim 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/.}
-
-	# 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 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."
-	echo
-
-	echo
-	elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
diff --git a/app-editors/vim/vim-7.4.ebuild b/app-editors/vim/vim-7.4.ebuild
deleted file mode 100644
index 88230bb678ac..000000000000
--- a/app-editors/vim/vim-7.4.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.ebuild,v 1.2 2013/09/06 06:45:52 radhermit Exp $
-
-EAPI=5
-VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://vim.googlecode.com/hg/"
-	EHG_PROJECT="vim"
-else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2"
-		#http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="vim and gvim shared files"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python ruby 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} )
-	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
-	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"
-
-	# 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
-
-	# 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 -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
-
-	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-rubyinterp \
-			--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 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
-
-		myconf+=" $(use_enable lua luainterp)"
-		myconf+=" $(use_with luajit)"
-		myconf+=" $(use_enable ruby rubyinterp)"
-
-		# 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
-
-		# 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} \
-		--disable-selinux \
-		${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
-
-	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim 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/.}
-
-	# 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 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."
-	echo
-
-	echo
-	elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}