radhermit 14/09/06 17:53:59 Modified: ChangeLog gvim-7.4.430.ebuild gvim-9999.ebuild Log: Revert to using a single, compressed patch file. (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 4F064CA3)
Revision Changes Path 1.437 app-editors/gvim/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/ChangeLog?rev=1.437&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/ChangeLog?rev=1.437&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/ChangeLog?r1=1.436&r2=1.437 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v retrieving revision 1.436 retrieving revision 1.437 diff -u -r1.436 -r1.437 --- ChangeLog 5 Sep 2014 22:37:54 -0000 1.436 +++ ChangeLog 6 Sep 2014 17:53:59 -0000 1.437 @@ -1,6 +1,10 @@ # 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.436 2014/09/05 22:37:54 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.437 2014/09/06 17:53:59 radhermit Exp $ + + 06 Sep 2014; Tim Harder <[email protected]> gvim-7.4.430.ebuild, + gvim-9999.ebuild: + Revert to using a single, compressed patch file. *gvim-7.4.430 (05 Sep 2014) 1.2 app-editors/gvim/gvim-7.4.430.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/gvim-7.4.430.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/gvim-7.4.430.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/gvim-7.4.430.ebuild?r1=1.1&r2=1.2 Index: gvim-7.4.430.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.430.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gvim-7.4.430.ebuild 5 Sep 2014 22:37:54 -0000 1.1 +++ gvim-7.4.430.ebuild 6 Sep 2014 17:53:59 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.430.ebuild,v 1.1 2014/09/05 22:37:54 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.430.ebuild,v 1.2 2014/09/06 17:53:59 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -8,22 +8,14 @@ PYTHON_REQ_USE=threads inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-single-r1 -# 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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" fi @@ -98,18 +90,16 @@ 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 + 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 - epatch "${patches[@]}" + 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 1.18 app-editors/gvim/gvim-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/gvim-9999.ebuild?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/gvim-9999.ebuild?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gvim/gvim-9999.ebuild?r1=1.17&r2=1.18 Index: gvim-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gvim-9999.ebuild 5 Sep 2014 22:37:54 -0000 1.17 +++ gvim-9999.ebuild 6 Sep 2014 17:53:59 -0000 1.18 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.17 2014/09/05 22:37:54 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.18 2014/09/06 17:53:59 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -8,22 +8,14 @@ PYTHON_REQ_USE=threads inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-single-r1 -# 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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" fi @@ -98,18 +90,16 @@ 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 + 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 - epatch "${patches[@]}" + 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
