Version bump.

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

12 files changed, 1112 insertions, 54 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index ad02b40c38d4..69c47692dfae 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gvim
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.449 2014/12/23 17:22:22 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.450 2015/01/04 05:46:45 radhermit Exp $
+
+*gvim-7.4.560 (04 Jan 2015)
+
+  04 Jan 2015; Tim Harder <radhermit@gentoo.org> +gvim-7.4.560.ebuild,
+  gvim-9999.ebuild:
+  Version bump.
 
   23 Dec 2014; Tim Harder <radhermit@gentoo.org> gvim-9999.ebuild:
   Drop duplicate dep on eselect-vi.
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 09650dd37c2b..d082f2bf4d6c 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -7,6 +7,7 @@ AUX gvim.xpm 1371 SHA256 adf603379740f509b0c543f9ac78a3eda7c804958c1a9086c50e7da
 AUX gvimrc-r1 1099 SHA256 d6a92cf8e9b7a3faf92285214c97adcae4fa6632a00e0c1a2bfa34caf167f17a SHA512 9f772a9b85f64bc55abb7ab4f76fc84a49dade11b7d19e187d0ffea10c5487ea3f2504d1a370fc61bc3ebfd2db4a758afba216ebcb50c85d8f40b1c4cc7084e7 WHIRLPOOL 0be48dc54a1ebf26531741a33e3eb27e4a5977dc220473d69837cdf1474b71aafb2511aa33f8fdd378cfd6ff4295a98a12c0183499bb3e22c746a88b88b43a65
 DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
+DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a
 DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66
@@ -16,17 +17,18 @@ EBUILD gvim-7.4.273.ebuild 12242 SHA256 7274038e826623944a35c4d4b396cd10509e6132
 EBUILD gvim-7.4.488.ebuild 12501 SHA256 e310aab40f3e9aeac9d090bd7b0f31498c53bd39fd41be0d58b27ed5044c040e SHA512 a241f40144e3f0d7cf09095694502fd10df1ef9472391b7c91e4d4cb7f078f58b52229ad07d7afe88860c892e4377607c26dbc624be1e521ac0a09ae35f3c148 WHIRLPOOL 15d95903380208806f3dfc8b1dae459e75c46f6fbc7baf44923b42e2222ce1202387d71289d5024ffa5a8e4457114c8bc682829a6979d4395faabcb02a7f5711
 EBUILD gvim-7.4.527.ebuild 12501 SHA256 c208c8777b8127eb4c57f6add60afeaf8f1404148bafeabe7530082e7554aec5 SHA512 0e703f35517dcfa7677f6c8c28f79e103086637225900fb300a42543328ab56d93c0777f278c4b32a138af76339edff45ea80ff43651b6e2b23fcab0da670b09 WHIRLPOOL ba5aaf23db506711541a8262a0d4a33799190de4cef0c41ebce1166df1f9c48deac53a5305e49d00430a4ea740734ad37250240ca6d335cfe3bef8eeada39d25
 EBUILD gvim-7.4.542.ebuild 12492 SHA256 2e7bf0cb9190f2b052cea32b2227ca53542646c101d2c79a2fcdf6586c76a386 SHA512 a082a237bbfb5bfbeecc6bd4a0688790cf7f2bc6c75a2aa645b42e751fd0912d6f4b9a43a2ae15a5fa681eb4ea2ae9e28335af51d793451d76b144008309f46f WHIRLPOOL 3555c34aadd70cca7305893ee5c9aa5ed712319c5fffa49467a47a720b8e44b4d5ce16da61b08d56c90e5c34f32acbc6f3918a8c39fea47ba61822317876e5af
-EBUILD gvim-9999.ebuild 12399 SHA256 83cf6e4876b676109665688f81499829480d7937ab4b87529f91350f6f5ea0f9 SHA512 652e67f00813c6fbcf5d9b7cad8907352452a4819816ff2160c409b8dfb2db407b11893d8086147232f3a15a8197aa5b8760e2f04a22da1fd24eab602c73753c WHIRLPOOL eef61663da960b846faa7a53e0e6a18e8598124e78fd8eb6bc173a9c46e596e8aa207400cc074b11131e9b54f1af9b3a76364d09bf18ddb6747b5d925fe17d56
-MISC ChangeLog 61819 SHA256 b85d211c550f7bfa01790f769a17c257c4747a822dc081c56182899fbeb26439 SHA512 a7abd2eb7f6961cb6d3101f079926dc2ba7f9dc83f0e37324961a66a05a4ecc37175c90d5bb76a4e92d2acc1611474897d8c0655bb983b11e85979e14d5d8506 WHIRLPOOL 278c891eb018b2f67cfcd704bb80c864f4a7f3f235aa3b784d211a59eb1ad4efb908bbeb24e870cb157c405f30e3888051e320673ee24dcb534ff54339413810
+EBUILD gvim-7.4.560.ebuild 12375 SHA256 ba3c230d7fe2e8fc2757a9c2e55eafc6e1fb23fa1d25be3590deaa87f19f0950 SHA512 be43518842526937d6239a207072da2dc74ef5d225029994c757722a5cc2a5cc6969bc6a6508a9f97c5254712326138225b85ab6d8d2bcaf456e560b1d80feb2 WHIRLPOOL 699b694d6ed8cf8c3eacbaef201bf47c8e7dde19571ac0dfc7ef78042d3329ef21abc5d2619f50f285db2b9dc768eb0c6b1d1d1f47206c862847df311f59f862
+EBUILD gvim-9999.ebuild 12371 SHA256 c00fe12df096b44fb9c1121c3a609470ee029f61ffef5d201d45fded3625d666 SHA512 d92390b7d10d92599f48be9ac8a18483d54ec0300c0173f2c8d83aa45040fd8bdfc0dcfb2f36a3a4247f47575bd8dd8aa429306a1d8940708edbf7e3712f648a WHIRLPOOL 9ba4014a0b045df794fed009b9a2bcd17e453c7f78bbc78b9688d2d83cbb353d03a719591a3f1553a1d8f79f71ae7824f2a27ed7e6768fc16fb93638dae53c7b
+MISC ChangeLog 61956 SHA256 22740e3d143a9e996ccdce6519c42770f3779b2685f138776ef2a4714d626622 SHA512 e8983bc220a55513576d6e15c97eb2c85561ae8806b8ac45f99ef41956a92889275b1c8770ef65f0e2d0117379a928d975b34a5ca386c9471587c018ad081c52 WHIRLPOOL 61ccfd0cb1c6de959ac75b902f55994619f36f9535f8747d1f286556508aad7a3978a99ca1e17ef0c41dd2c2780f16b4c6a4647ac5d7827beb3a54a32d8cadb9
 MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUmaUCAAoJEEqz6FtPBkyj69oH+wU7kOqYAlC9P6wEG46ECryF
-9ea5CU+QSptjO+PwDuuhpqJ9F9dy8D833A4yWf4JHyk2pNwGnM+7BInxecHFh+m0
-0KiZpRiavI1rNJ1l+me0pFNrfrbYHd5w59BB/qAG12g6U/TSf5gTuL/xH6xc6Hfh
-Qf3L6rtksxJzDBHXhSTUM9Fpgi78YvMgrR9xNhli6S7hRteTfBcGbUWAKTK+GPm/
-+yryizzSNpcJ7dnZzrWBd+e610/HESgh4jNH4x5dr++3tIRFf3vw+8FeSgbmlzTf
-BIBNPXJFDyeSvgEYLDbugkTbZ7JKrxLdRwAXm7iyx8v5UVlDpTV8bR2uCD7C98s=
-=oOVn
+iQEcBAEBCAAGBQJUqNPTAAoJEEqz6FtPBkyjkgUH/0ZXrvtHl0lEoo8hLZJdyo7x
+9RyAlfMLDdm336Zu/4rJLiC7lkN2edsuaWByp2f6APxhZREGnRguJXBnFn0vupiz
+GICO8WXxNB7i1Fh4N/uUgyrJgoIXSXfacDjzN6bhFfg3EHHLhtBT8WrHnD6pqDST
+p58goE/zrhfF/tbgfOvIWQXJ2MNgDwM9tSqZHSek+vNmIqrRelcvCNkjLorYhBGx
+UmPUNk1i4TCQsIe2436+UXHITteExxfCsJy5ytSF/rZRyej7GvwJaz6Nl5SQMl2S
+OpXE6JrCDqXkmHmcSoN2e2jL7Wd+NKK9b260i9VxxomBJUCRQcAs4LWj80gNYyw=
+=PDIy
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.560.ebuild b/app-editors/gvim/gvim-7.4.560.ebuild
new file mode 100644
index 000000000000..7113852657b8
--- /dev/null
+++ b/app-editors/gvim/gvim-7.4.560.ebuild
@@ -0,0 +1,415 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.560.ebuild,v 1.1 2015/01/04 05:46:45 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+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_PATCH="vim-${PV}.patch.xz"
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
+		http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
+	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} )
+	luajit? ( lua )
+"
+
+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[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl )
+"
+DEPEND="${RDEPEND}
+	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_PATCH%.xz} ]] ; then
+			# Apply any patches available from vim.org for this version
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
+		fi
+
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(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/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 90ea3389ecc3..88e2f183df86 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.23 2014/12/23 17:22:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.24 2015/01/04 05:46:45 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -13,10 +13,10 @@ if [[ ${PV} == 9999* ]] ; then
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
 	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}
-		http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
+		http://dev.gentoo.org/~radhermit/vim/vim-${PV}-gentoo-patches.tar.bz2"
 	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
 
@@ -89,9 +89,9 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
 			# Apply any patches available from vim.org for this version
-			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
 		fi
 
 		if [[ -d "${WORKDIR}"/patches/ ]]; then
diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 8ff585f3aa5a..9e43bc3a9c3e 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.456 2014/12/08 06:00:45 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.457 2015/01/04 05:45:17 radhermit Exp $
+
+*vim-core-7.4.560 (04 Jan 2015)
+
+  04 Jan 2015; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.560.ebuild,
+  vim-core-9999.ebuild:
+  Version bump.
 
   08 Dec 2014; Tim Harder <radhermit@gentoo.org> -vim-core-7.3.762.ebuild,
   -vim-core-7.3.1214.ebuild, -vim-core-7.4.430.ebuild,
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 8eba9303a35f..0130d708cb4f 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -5,6 +5,7 @@ AUX vimrc-r4 6919 SHA256 9c59acc4c486a2aca5c6e5e297f13521a8ec57ebd540ec9ab846112
 AUX xxd-completion 461 SHA256 580064ca4db3ac149fd89c743bd9946241220c211721f978f7a3ef97b3c171df SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c WHIRLPOOL 65324afb44612f1dd8f8850b7caa8524cff055d83aaad74c5b5030787463d0a95dbe0ce1b91c1a7b7f3e6954db3c0608ac2a2e1e75572af94e83758237b18447
 DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
+DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
 DIST vim-core-7.3-gentoo-patches-r4.tar.bz2 3015 SHA256 a4f61e4d0cd1848812f603e7f6b8a5304d13ac199f4e3061264cd3bec75a17c5 SHA512 0ba7a20dfdc2c24a92a4af5a6fe49a94d5d5c5e9111c42c4812d0cd52c26cc567acd2d7e74f66730afd3c4bc9f1667b0ad9c1f82f93d2844d8309b143f293676 WHIRLPOOL cec628c0f19971077677e667cc8903ea0a56041799a43907d47acc218fd9e0a6ea2a2a30999c74512fb36d233c6ac6d436f033684290155ff6ae70be5277bdbf
 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a
@@ -15,17 +16,18 @@ EBUILD vim-core-7.4.273.ebuild 7307 SHA256 b9ca490150e34c11c88c9c1689da45e88828a
 EBUILD vim-core-7.4.488.ebuild 7329 SHA256 bac64687000fd5195b60023a7de517101e78fd0879f7ef24a3b58f979e0fd756 SHA512 074d4653a1e2fdb6a0bc7eb4de4632ec83a2c6961d0922dfcc6d7d173c2dee566fed646aa343f1be1ea7c469dd8e29d28c4a7374d89ef761d9ed5b5d673c2f0f WHIRLPOOL 0c7cd4950173f36a0a6e9c11415b220eefe4e003310e5835a1624d769dfa8b8335ea6768c4b6ea70106bc3e07fb1870264877119a9231fb3707bcd12771e5a67
 EBUILD vim-core-7.4.527.ebuild 7304 SHA256 70b799da600d1b4c32b5790c7785150fd4be21ae129e91f3d522ed3e18445ae8 SHA512 6daf6ce5dda3586d1625a77456a3b83e28b84b831d3b76049620cf7ff1956158b80016204fe0f3bcb86c54cc6ec657b46e99c93833b04228db228eccb34f6738 WHIRLPOOL 9f618984c79e82b4f5cac30668a7ee8c7fd0396c32a70530dea1692eb52304c5800c0af6e73e95a9529e98cb15bcf98752d57bed2cf25411a405b6e399efc4e9
 EBUILD vim-core-7.4.542.ebuild 7295 SHA256 de9c01a6270db1e8a5bc97545d018bda8b2b087214a18313a4a975d5c2db04ce SHA512 eb0bb59ff4fb6f8e129233a2ca4be9300524d3dbfa83c15f1a2274c449a930177bca9e65dcd675a731e7b94d67045600b968177cfce0ed5321ee9a59e8fcee4f WHIRLPOOL 81a85e15c8f458dbb21064addaeffaea46003f1ab76f88dc0b753310c86407d2935d83dcc69caf7c0114596ed35ba8fdbb8fbc119195988263266a5e1b0e5eb5
-EBUILD vim-core-9999.ebuild 7302 SHA256 305a4f899aaead5c256d19aca0b803b02bd37808eaf1547efac63770d901f3e1 SHA512 03c5b9510f8bcdfeb2a804ed90f79974344bd9305a03b214d5b302294e05260da7bd573a3e6e465773390fcfd8655c45358bab0f4134995f24dbb71556b9d9bb WHIRLPOOL 8fb39d4495712e7519494be708521858b7b6878624f61fba428571ccc2012bf1412ce6c77c25f0db724a4b7f5dd70eb450e423ff3b83a8ab4e876db3a9076ac2
-MISC ChangeLog 62103 SHA256 de555e5415234d0d92a5e4963086c981ff51cf9497c27b171142a100568a6419 SHA512 7b16ee067daa5cd03cd95cffef2adc90c4a4b5b29dd5d0c43f0ee4c1a0faedf0f6ee6dcd2c5e4471e2cf8edb4b15fe80ff22171fb33108d31d3dbc7b5e70ef0a WHIRLPOOL d1204e4ac71a412c28aed4ce9cbe3739b084a920e6344adc88c12177c62759cf3649c1623ab28f65db1336693ed69e1e7c4b720a445d4142c28dcb3576e77d60
+EBUILD vim-core-7.4.560.ebuild 7278 SHA256 3cbd4e52fd9cdae36c9535e5e8221bba5f58d01fa24f1a69e0e92234828448b5 SHA512 14f2a9a33b9627247f51ceb758b39c2c2ecc244dd9c64778ef35429ad27a8113f47f9dd138eb5bebf7b123b4665f6e31d6ef92eade76985d0d87ffcae362f131 WHIRLPOOL 2a7bea3f085423d905f187e1d9ae9ec4bdfdf9408225f001952be8f38411a4faab2b7e5b31360dc0af2b90dfacd1428a0840749cb732de752f132fd4b2f18bd4
+EBUILD vim-core-9999.ebuild 7274 SHA256 837c4439e16232779168417df58ae9d5f0e90453df504e614889677a22826013 SHA512 0bb82fe43539d5fc8a1b2a99917b705d6abad6eb3f88eaafd6cff2c94d87dbeb9dc40a58db1b17e5502d5ba258548249d987268e3ace81f0b66ca7226cc36e72 WHIRLPOOL e9f8c49b2436b75b0b654560c45fc0b20b3dee27e2c117e0261870c727d0aeb4b2eb17fa3b2e50dffa88b517f150df4c244b881813a46219d619d10bb8a5d90c
+MISC ChangeLog 62252 SHA256 bac28a7ee5dec807060d658ac23a85f86f9819a1a8992731551c184099be1d73 SHA512 9080e2a5558c10735dd02453517af8aaefd3a79b10501b2c64bc64cfb185cadeff3b16ff297f0034690c46a953e298ee3edae412c2ad833a2139a3e07668483d WHIRLPOOL 8e97cd5e390db6a0da36c5c13e8771d969986588a37e25b7694018a7d7fadd4415f5654c354e0754dc93484033877ec219daa40955f1171042897b7f3176bd02
 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUhT6XAAoJEEqz6FtPBkyj3ckH/j6W7mZLogEfEPcVDSbb3SxP
-SsMlRm9BwjbozJxMcgEHgxXjiUTmwFi8ZPUEmpAQksajMcOrHUidW5meDh5mGaVH
-N4u9YK65ad9cacCIXf1BNM2HHXmkFolEjSa+vK5wBsmOutQ5idpYuGDkAKZnUWXQ
-S8/JdK1c9fxGVsglOg/wbAZViTzKFnQ0ivFN47xaVxewR8wzvXy7ZrldwmXOy82k
-o0FN0It7OASjIdmBDwWx0P5ZrE9J7Goo9uIehkZ0dvvk/tjhSSwvjSJCobUK3m0A
-Q88Yo5jS0U68V4YolwQ5D/nCSgf/8O8sd/dmwI5M4/mZxNqbRKc7zyNDWMecb1E=
-=C4hZ
+iQEcBAEBCAAGBQJUqNN8AAoJEEqz6FtPBkyj+r4H/0x+UY1t1YTPSOOs71ZvFZ9b
+h1Eo6rdedp19Xa77GCHjeN8cUG9CfA585sSdvvVNQ8w4yrUxm4JkEcoNB7GQSDfQ
+IYrY/cu1hgwpGcn15S4a8SWOb5j540EJha5MHoA+rt3NTqia4cit6LApcGgPrb4A
+pXJrhydMnSku50BpDq/n1v0l94vMGaoz3mp7zk8FKc22AJaU8aC3+rbwyMURlCb7
+8MxNcIRMW4CKQknEA7EYRm1/MbYjCgc0JSXh2sG6qQYpOxWqdsc4AqQYbgn0wOw6
+nRiIYI5NFxZDGx+WBdSyzCq06X1nVtdNG2ARZpxOtcoKI3546m7LcVdcTBvEKvQ=
+=C5CI
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/vim-core-7.4.560.ebuild b/app-editors/vim-core/vim-core-7.4.560.ebuild
new file mode 100644
index 000000000000..57c4b1e31ebd
--- /dev/null
+++ b/app-editors/vim-core/vim-core-7.4.560.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2015 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.560.ebuild,v 1.1 2015/01/04 05:45:17 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_PATCH="vim-${PV}.patch.xz"
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
+		http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim${VIM_VERSION/.}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
+			# Apply any patches available from vim.org for this version
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
+		fi
+
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	cd src || die "cd src failed"
+	emake \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		install-icons \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r4 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal ; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
+		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
+		rm "${ED}"/usr/bin/vimtutor
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	# These files might have slight security issues, so we won't
+	# install them. See bug #77841. We don't mind if these don't
+	# exist.
+	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 73043557ea41..4f0c5109d8cd 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-2014 Gentoo Foundation
+# Copyright 1999-2015 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.12 2014/11/24 03:29:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.13 2015/01/04 05:45:17 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -11,10 +11,10 @@ if [[ ${PV} == 9999* ]] ; then
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
 	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}
-		http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
+		http://dev.gentoo.org/~radhermit/vim/vim-${PV}-gentoo-patches.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -42,9 +42,9 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
 			# Apply any patches available from vim.org for this version
-			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
 		fi
 
 		if [[ -d "${WORKDIR}"/patches/ ]]; then
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 04a5ef4994d5..44a52d223158 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/vim
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.483 2014/12/23 17:20:55 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.484 2015/01/04 05:46:13 radhermit Exp $
+
+*vim-7.4.560 (04 Jan 2015)
+
+  04 Jan 2015; Tim Harder <radhermit@gentoo.org> +vim-7.4.560.ebuild,
+  vim-9999.ebuild:
+  Version bump.
 
   23 Dec 2014; Tim Harder <radhermit@gentoo.org> vim-9999.ebuild:
   Drop duplicate dependencies and change lua prefix check to use usex.
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 74d263f08522..08809e0c0d36 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX vim-completion 1004 SHA256 8191a5a47e03de62d67ad6936259c8eb005e50b52d94994bcf4164e54ffefdae SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41 WHIRLPOOL 0f5d9ed640ecd3520c79e9abb4473bbca66f145106d2c997791eacf6f0f93131f102d55b2f056f87484c5d5ca781af958fd48f1a24e2c2c1a4ac1be378700f84
 DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
+DIST vim-7.4.560.patch.xz 741936 SHA256 e67cb9ba8772c72c3ebed0727e6dd57fc8eaeb1c8087cab7b9b8fe52f9063e04 SHA512 6748efa85883cbe811f4997192f5c0c11ac4825b40a3ef81a9a457eab26d86868aea6f62c8ced7018b3a7758242bd6c8e789fdfb8ce111f4b468f6563bc146fd WHIRLPOOL 45864fdabb133551c66768a4c075588744b99fc823f555ae19a440b2486054e1336c64c50f0bd7e3c1c0c88a0e345595a4bd384cd7dde312ff1465351db869e1
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a
 DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66
@@ -13,17 +14,18 @@ EBUILD vim-7.4.273.ebuild 11591 SHA256 014baae49b7e6bfafc2f55997d75738f048ee7b33
 EBUILD vim-7.4.488.ebuild 11944 SHA256 bacdd6a7ed9f18723f30ab5e0787c7ebc5866d4049b4054fcb891714b2423e05 SHA512 09c0897b2ed5785e1ce0297c98bd79e799bad7062e44f0aa210fd397a30e1f6acb754273587e488a5eed02994eda77c74a78c071d43eb644353d36fe21d4b85c WHIRLPOOL 4bdbda58d50ce9178659b601b1d132a8c1cc1b17a1a2a1ed6f8f3ad3c9fce063a698e103f06633d05d0dc1bdb66a782019ec0b868a9612a7a016b37785d51a8d
 EBUILD vim-7.4.527.ebuild 11944 SHA256 deeb77a5c2ac1eafc87a9ffc8bea469b4e87b0a1e533d0db27e6cff658e4eee1 SHA512 74f7fc2d72e016d7420a8f57a874f31119f90ef9186fdd7bb761b43e022912604dcea86b1258d13a58e075957894ba813f32fc07f6308473786793d3f1d125a8 WHIRLPOOL 2f2a907d68ffbe1ec64b0b8c9113eb7f5df0da39092d71f0e9d6ec8df847c87700b095fc8261f163b936f06c66dabb29c9fd482c1ce14b0cb5d2379c509b1c26
 EBUILD vim-7.4.542.ebuild 11998 SHA256 bbb865bb61e76172a80ff39b8e1b98caca4edaebd5b3abc3394ecb8876fd6547 SHA512 f212de529f4c45b30ed89fb198e56767996eac11cf3b884984bc6ffdd071c9e4065b817dc4bf929c1e628594e1c4261d74e0e6e1ef80e52548e5dc348652744a WHIRLPOOL 17d5024c8c04f2daf2fc0e1e7bbd4adf6094c086c1c5f8dd604059dd19442b8250c86c2d69286dd4c3ee03454fc2b8a697dd1e30f3c91d8a8c3e2d41d54869ff
-EBUILD vim-9999.ebuild 11854 SHA256 9f17568a15bef70ae8e8af59e38742f26db11a502055c832fca0560ecf7e782f SHA512 b4e30fd81d14c0af288e0a43a0cf347cab69244b66477ccf62104fafc4875a6e1af1ae3c574972252996f7d261f5a55eaa0d42b628d413dc3dae26d356955b68 WHIRLPOOL 26f4a8060aa497494f8995bd4ec94af8b94e55316de319051d8e5d6f33ca02816706317fd4272dae3d0e0c195f90048a366a2c81da6a466a9cfb0cf7a4f08397
-MISC ChangeLog 65378 SHA256 c9548b0b697b47ea371d1ea76198caf1dc06f8e299b8c414252346c515fcbb99 SHA512 0317f657bebd7159d26e69706d132f5f6a2f836e7d6a246749446c3866cdc05af5118d9cdc6e935848e1e4e169ea18cc56e19743cc09c2ecb5ffd554903b5b09 WHIRLPOOL 3db29b64e1165319e2db92c94503c38e0e2c8dec9a61197476b8df51f690a29a287da265f8461ae30b4d49e3efdddb7880e017503ee0bd1bbdb93da71f0bc6b3
+EBUILD vim-7.4.560.ebuild 11830 SHA256 eb92fb3a1ce73fb95a2b2ae0d50c3b3bbef9599802667dc789868bbbb00e9922 SHA512 9d7fd6da5721dea40cb4c469636ab1726449f68531446bc90d1fde273cd6dd3817503fe1868d1f67fbb013969f5233e27c6cb78bcde83defda0e3c95c20d426f WHIRLPOOL 22abb37d0682ea819930b23a40f79584ea95c42c43a7546d1446c2a31fc02765e038fa84169ea28079775ed5333d34aa2c77e0c9df0b21064aa8d1a1c8a9a0f2
+EBUILD vim-9999.ebuild 11826 SHA256 a9d2242f2795b50b3f00d609e51e31cf33efe4152971b46b5d27c0b7ddf31d13 SHA512 ee232f6f8fbf21a811fed2f15f667f2f132395ec14313b9b3032ee6e718dbf4432e5769ff003cc066ad16b1277c927a07b1bb0585b84ea68600e2d52ce4a45f9 WHIRLPOOL 80064679fd92676d73603c7f656eabcbf7e78242bc26c9acadb7a1f9e2656fe84090774465b6627fd2a5313db7125526cb7a20eb43fafa25b408266a8fcfabdf
+MISC ChangeLog 65512 SHA256 8a28e7b61805f80b86c712c5f57e81f5937ca8c978673ca3b5dc65598685a90a SHA512 99f7a984fa960918803cc05abc62b9cb1a2c6da1a6a0fcc7b9fd47c074ad21cf4a9933a6c066390ae53e66eb5cee5bb183dd2d0b37380ba95c046cb41d38a4b7 WHIRLPOOL 543ed81eaf8b2f00a0e00b6a3027386078e82339dee3422af1f535028aaa06a67c07aca7caacb61141b4ae7d12234d2e14749e5349d7f136273f6d46ea60fd39
 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUmaSsAAoJEEqz6FtPBkyjz9UIAKl/sItT4FCqF/XemVVaRMxb
-KNiU6j4ZKcA78kwAXXM/LLz18lzNaV+NxagOUWlSQGZ1fvwFYHMFMqdpASK3Hp6f
-hCpYrkeROGNlwnPdx0LLfqOoVxK+nS9OWkfvjbZhqk9Do27+NhjQX6NhCcL5Qat2
-ZNscNZRyNBKwX9KvWjxGDzgTkXFVOYThyXJ9k8LpsQwZ7A5ubh+q9Rgt4atFJDzN
-Ks/TrhGd5JhXpAbi3xbpnGpulNnAd2eEJUQMBieWDhcjeX7Be2caWUHL1JBHpGIa
-7nsEy2PeGdpJg+mQYTJLHrDlcBqh0aN+JYeEtSgQ2Ru65lH+vmVYYaRC9Hnx3RM=
-=wEMT
+iQEcBAEBCAAGBQJUqNO0AAoJEEqz6FtPBkyjWFEIAIhERcZluTpj7UE0dR3FJv2d
+16mXi1hp0slxaLxVDf0ME9x1pCumFHIH/pil+GUtEq/Ht3pB35K3jPGcDRwSX94/
+QDtwhcjoFN8/MGgs3ayOVUqV0pFbjD+vjki5fGglOKau264abfj3E81sbsDxFFij
+Yka020SwRzC5sD8aFBz18NgBeWyDsJ+YJ4JrYlWMB5mdiwbYAyRlAEKXucfyQifh
+bZ6Kwx34pkyik6U+VK8GCoM5K87ZhzqeBXBeZwPhuJao4EFq8OqPg7eq832Vonen
+APN/5AnqWKSn51hABXFX00CgaLSSi5G1Y5vxmQShBr7SJrBTBJ4qGKxXD4ydbV0=
+=3RSB
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim/vim-7.4.560.ebuild b/app-editors/vim/vim-7.4.560.ebuild
new file mode 100644
index 000000000000..42355c1923bf
--- /dev/null
+++ b/app-editors/vim/vim-7.4.560.ebuild
@@ -0,0 +1,389 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.560.ebuild,v 1.1 2015/01/04 05:46:13 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+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_PATCH="vim-${PV}.patch.xz"
+	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
+		http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, 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} )
+	luajit? ( lua )
+"
+
+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[deprecated] )
+	)
+	!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.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	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_PATCH%.xz} ]] ; then
+			# Apply any patches available from vim.org for this version
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
+		fi
+
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
+			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches/
+		fi
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.in || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# 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
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.in is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	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
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(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}
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+
+	# 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
+}
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index bc06fe5304fb..3852b6ba1f71 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.21 2014/12/23 17:20:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.22 2015/01/04 05:46:13 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -13,10 +13,10 @@ if [[ ${PV} == 9999* ]] ; then
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
 	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}
-		http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
+		http://dev.gentoo.org/~radhermit/vim/vim-${PV}-gentoo-patches.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -75,9 +75,9 @@ pkg_setup() {
 
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
 			# Apply any patches available from vim.org for this version
-			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
 		fi
 
 		if [[ -d "${WORKDIR}"/patches/ ]]; then