diff options
author | Tim Harder <radhermit@gentoo.org> | 2015-06-18 06:32:52 +0000 |
---|---|---|
committer | Tim Harder <radhermit@gentoo.org> | 2015-06-18 06:32:52 +0000 |
commit | c20e5132f6c324848d79437dcd53c050e2b0e0f1 (patch) | |
tree | 01416195eb2a8e4c4411b39f09a978b6ac192a7b /app-editors | |
parent | Use correct temporary build directory for live builds. (diff) | |
download | gentoo-2-c20e5132f6c324848d79437dcd53c050e2b0e0f1.tar.gz gentoo-2-c20e5132f6c324848d79437dcd53c050e2b0e0f1.tar.bz2 gentoo-2-c20e5132f6c324848d79437dcd53c050e2b0e0f1.zip |
Use correct temporary build directory for live builds.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/vim/ChangeLog | 6 | ||||
-rw-r--r-- | app-editors/vim/vim-7.4.738.ebuild | 6 | ||||
-rw-r--r-- | app-editors/vim/vim-9999.ebuild | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog index f37e588b6322..b80aba7a273a 100644 --- a/app-editors/vim/ChangeLog +++ b/app-editors/vim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/vim # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.497 2015/06/18 06:15:55 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.498 2015/06/18 06:32:52 radhermit Exp $ + + 18 Jun 2015; Tim Harder <radhermit@gentoo.org> vim-7.4.738.ebuild, + vim-9999.ebuild: + Use correct temporary build directory for live builds. *vim-7.4.738 (18 Jun 2015) diff --git a/app-editors/vim/vim-7.4.738.ebuild b/app-editors/vim/vim-7.4.738.ebuild index 053bc97d816d..b3ae8bcb26e7 100644 --- a/app-editors/vim/vim-7.4.738.ebuild +++ b/app-editors/vim/vim-7.4.738.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.738.ebuild,v 1.1 2015/06/18 06:15:55 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.738.ebuild,v 1.2 2015/06/18 06:32:52 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -8,11 +8,13 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} ) PYTHON_REQ_USE=threads inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1 +MY_PV=${PV//./-} + if [[ ${PV} == 9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${MY_PV} else - MY_PV=${PV//./-} SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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" diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index d3789262c631..67747a93e3e9 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.29 2015/06/18 06:15:55 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.30 2015/06/18 06:32:52 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" @@ -8,11 +8,13 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} ) PYTHON_REQ_USE=threads inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1 +MY_PV=${PV//./-} + if [[ ${PV} == 9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${MY_PV} else - MY_PV=${PV//./-} SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz http://dev.gentoo.org/~radhermit/vim/vim-${PV}-gentoo-patches.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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" |