Version bump.

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

4 files changed, 256 insertions, 18 deletions

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