diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2009-10-17 18:30:40 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2009-10-17 18:30:40 +0000 |
| commit | 291999cd613b2bc66a6479d3052757c9c24a788c (patch) | |
| tree | 504ce3a85c975a1aefc3c2aa3be8e5dcf4d474d4 | |
| parent | fix 64bit seg fault ( bug #288348 ) (diff) | |
| download | gentoo-2-291999cd613b2bc66a6479d3052757c9c24a788c.tar.gz gentoo-2-291999cd613b2bc66a6479d3052757c9c24a788c.tar.bz2 gentoo-2-291999cd613b2bc66a6479d3052757c9c24a788c.zip | |
A couple more small cleanups:
- Only check 'use python' if IUSE has python in in (Fixes QA warning)
- Look for gentoo/patches-all and a new vim-core specific gentoo/patches-core
| -rw-r--r-- | eclass/vim.eclass | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/eclass/vim.eclass b/eclass/vim.eclass index ba0d9c86919d..130206f3a648 100644 --- a/eclass/vim.eclass +++ b/eclass/vim.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.178 2009/10/17 17:10:52 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.179 2009/10/17 18:30:40 lack Exp $ # Authors: # Jim Ramsay <i.am@gentoo.org> @@ -236,8 +236,8 @@ vim_pkg_setup() { mkdir -p "${T}/home" export HOME="${T}/home" - # Need python[threads] - if use python && ! built_with_use dev-lang/python threads; then + # [g]vim needs dev-lang/python[threads] + if [[ ${MY_PN} != "vim-core" ]] && use python && ! built_with_use dev-lang/python threads; then die "You must build dev-lang/python with USE=threads" fi } @@ -269,8 +269,14 @@ vim_src_prepare() { # Another set of patches borrowed from src rpm to fix syntax errors etc. cd "${S}" || die "cd ${S} failed" - EPATCH_SUFFIX="gz" EPATCH_FORCE="yes" \ - epatch "${WORKDIR}"/gentoo/patches-all/ + if [[ -d "${WORKDIR}"/gentoo/patches-all/ ]]; then + EPATCH_SUFFIX="gz" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/gentoo/patches-all/ + elif [[ ${MY_PN} == "vim-core" ]] && [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then + # Patches for vim-core only (runtime/*) + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/gentoo/patches-core/ + fi # Unpack an updated netrw snapshot if necessary. This is nasty. Don't # ask, you don't want to know. |