radhermit 14/09/06 17:50:42
Modified: vim-core-9999.ebuild ChangeLog
vim-core-7.4.430.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.10 app-editors/vim-core/vim-core-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild?r1=1.9&r2=1.10
Index: vim-core-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vim-core-9999.ebuild 5 Sep 2014 22:32:36 -0000 1.9
+++ vim-core-9999.ebuild 6 Sep 2014 17:50:42 -0000 1.10
@@ -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 @@
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
1.448 app-editors/vim-core/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/ChangeLog?rev=1.448&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/ChangeLog?rev=1.448&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/ChangeLog?r1=1.447&r2=1.448
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- ChangeLog 5 Sep 2014 22:32:36 -0000 1.447
+++ ChangeLog 6 Sep 2014 17:50:42 -0000 1.448
@@ -1,6 +1,10 @@
# 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.447
2014/09/05 22:32:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.448
2014/09/06 17:50:42 radhermit Exp $
+
+ 06 Sep 2014; Tim Harder <[email protected]> vim-core-7.4.430.ebuild,
+ vim-core-9999.ebuild:
+ Revert to using a single, compressed patch file.
*vim-core-7.4.430 (05 Sep 2014)
1.2 app-editors/vim-core/vim-core-7.4.430.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/vim-core-7.4.430.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/vim-core-7.4.430.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/vim-core/vim-core-7.4.430.ebuild?r1=1.1&r2=1.2
Index: vim-core-7.4.430.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.430.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vim-core-7.4.430.ebuild 5 Sep 2014 22:32:36 -0000 1.1
+++ vim-core-7.4.430.ebuild 6 Sep 2014 17:50:42 -0000 1.2
@@ -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-7.4.430.ebuild,v 1.1
2014/09/05 22:32:36 radhermit Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.430.ebuild,v 1.2
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 @@
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
