diff options
author | Tim Harder <radhermit@gentoo.org> | 2014-09-06 17:50:42 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2014-09-06 17:50:42 +0000 |
commit | 9097430fb9f6699b751ea1e570bc9378af7ca4b5 (patch) | |
tree | fb16c8ffa430b2baacfb7d22c7abbbaa96ed8514 /app-editors/vim-core/vim-core-9999.ebuild | |
parent | Add missing py2.6 mask for portage. (diff) | |
download | gentoo-2-9097430fb9f6699b751ea1e570bc9378af7ca4b5.tar.gz gentoo-2-9097430fb9f6699b751ea1e570bc9378af7ca4b5.tar.bz2 gentoo-2-9097430fb9f6699b751ea1e570bc9378af7ca4b5.zip |
Revert to using a single, compressed patch file.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 4F064CA3)
Diffstat (limited to 'app-editors/vim-core/vim-core-9999.ebuild')
-rw-r--r-- | app-editors/vim-core/vim-core-9999.ebuild | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index 31f0b7d4e926..6e5dec311948 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -1,27 +1,19 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.9 2014/09/05 22:32:36 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.10 2014/09/06 17:50:42 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix -# Used for setting SRC_URI (when $1 is non-zero) and for outputting the patch names (for src_prepare) -vim_src_uri_patches() { - local i - for (( i=1; i <= $(get_version_component_range 3); i++ )); do - printf "${1:+${VIM_BASE_URI}/patches/${VIM_VERSION}/${VIM_VERSION}.%03d -> } vim-${VIM_VERSION}.%03d.patch\n" ${1:+"${i}"} "${i}" - done -} - if [[ ${PV} == 9999* ]] ; then inherit mercurial EHG_REPO_URI="https://vim.googlecode.com/hg/" EHG_PROJECT="vim" else - VIM_BASE_URI="${VIM_BASE_URI:-ftp://ftp.vim.org/pub/vim}" - SRC_URI="${VIM_BASE_URI}/unix/vim-${VIM_VERSION}.tar.bz2 - $(vim_src_uri_patches SRC_URI) + VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2" + SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 + http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES} http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-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 @@ -50,18 +42,16 @@ pkg_setup() { src_prepare() { if [[ ${PV} != 9999* ]] ; then - # Apply any patches available from vim.org for this version - local p patches - for p in $(vim_src_uri_patches); do - patches+=( "${DISTDIR}"/${p} ) - done - - # Gentoo patches to fix runtime issues, cross-compile errors, etc - for p in "${WORKDIR}"/patches/*; do - patches+=( "${p}" ) - done - - epatch "${patches[@]}" + if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then + # Apply any patches available from vim.org for this version + epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} + fi + + if [[ -d "${WORKDIR}"/patches/ ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches/ + fi fi # Fixup a script to use awk instead of nawk |