Use correct temporary build directory for live builds.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 23 insertions, 15 deletions

diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index cfea37071987..de6c41d27bd6 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.465 2015/06/18 06:12:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.466 2015/06/18 06:30:59 radhermit Exp $
+
+  18 Jun 2015; Tim Harder <radhermit@gentoo.org> vim-core-7.4.738.ebuild,
+  vim-core-9999.ebuild:
+  Use correct temporary build directory for live builds.
 
 *vim-core-7.4.738 (18 Jun 2015)
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 63d644f4a569..36312fa57da1 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -17,18 +17,18 @@ EBUILD vim-core-7.4.591.ebuild 7280 SHA256 472bd4528d24e49a80030de2ed573d0d00773
 EBUILD vim-core-7.4.622.ebuild 7285 SHA256 9bb92aefe746df6bf35159f919beff75643f80416e79bf54283c35d737adf8b6 SHA512 467eefa8956789ec9b6efaf0958a0f4d16dfb3f1a6327009a7c021a3bf72648dae1a563d59addc097731d3f140a42a31e4cfe9822e36b221bbbf24df8da7abf8 WHIRLPOOL 4fe446cd52643a3efbc1847b6e64ea33aa58877e1d6b2b52f9a59807ff68d3c63f732dd9122d22f88c5dc41af0437359b8b1f1d2d63e0383fd983c82d4e5a28d
 EBUILD vim-core-7.4.670.ebuild 7285 SHA256 3517c9615c476b15078f8602747241675a60a2284a56bdae3813ab2ee3cf8e25 SHA512 93bd5938d48c550705c048948c6de2f0eb0d17d737610bb0ae94bcb794a529a3d2fe50f5a8fa7442e193d7942082995cb70a4046752bd87c3ae85455ad74bb83 WHIRLPOOL faaa25c9c272ee036faa30d9158a537152a4673f930a8f5b9ce8106c315c09fa756292526c01a459f293dce5ff73c1d9296f12d43ee223b0029849599d7405dd
 EBUILD vim-core-7.4.712.ebuild 7285 SHA256 b4c67239511ecffcdfcadf43b463db0d48a85c864998da4d8a856be32af40922 SHA512 efca85cd6ca6b88468652f2a65bc93e8378990428f5ff121482004dabf00e3c836ea567c13e1ab06bb8e7b252727b06109efb38d68359d308737362b0fa37aa7 WHIRLPOOL 83557ab477282cdb26096f7de67b871e4a3627dc9eeca2b649ac4cc0629304858b31ab50facf14deaa1f92d5c8bd0feeba46b7ca5ab084029d52c633d4d0cb8d
-EBUILD vim-core-7.4.738.ebuild 7029 SHA256 c2e3b5b91352c4a787690f5f27a6ff87914b149e5ff240942676307539cf33a9 SHA512 8a36550ec112b108ffeabd8d869b4c96c8783c84dd23bbd27dd747baf71b409ef2b190c8bfa0b835e679cab6e17067ecc8b09c1949e17c35d04ffb23448c2a7f WHIRLPOOL c7c16e7267eaa6e620442ddf9961134eb3399906c85cb57f6f64dba6daf11c9ffa13a5c3d5bb266608462115883c378b9a4e685c0ce7e41b38395e217b84524a
-EBUILD vim-core-9999.ebuild 7027 SHA256 929cae141cb75d8eacaa892107bcdd439df2867e9893b4357f8095187cf47afa SHA512 c0f64389265dd3d5eb5d38bec3104450af3ad3606b56da877cc4834ffa76304d182362bc254cf159d2beb3f3cccf0849fe972c03ac6b19f2bec81c1dee539ac5 WHIRLPOOL 81c44b8cbf95e608866ccaa26a2209bd63bd2bc50d5fa20b51982915f7d48e58961e220013236029372193831dd12ba86c32ae0053fad6a66c9f0bf7614e075c
-MISC ChangeLog 63304 SHA256 7b84c6a96b00d8cf5e1cf5ab385819e47abedcbf6d4dd5854b345ad24b8999cd SHA512 01a1d40f463849c80770b3e7c8741555bc5539413da050415b0e0fbc087bced1cba47a767a4c0b1bab1b2870bd5e35025f0e4029ffcd6ed928faa7db28bc033c WHIRLPOOL b291efb81d722130ee6c88cef78f677ff8ec1fdf4a3f58c961862dc62ac6abf5ffd3b3b678c229637c7c833a470363b74378667623bb4e9e8b0cb902d86a7662
+EBUILD vim-core-7.4.738.ebuild 7072 SHA256 129196d0c21754d2f16969b159f44e6ca23584bc00c5bda182635435125be68a SHA512 4a98e510304216f3a7b2a6059a94f471211d72fad841fff706c3aa0a54f1c14daf8150b1bc1856ecebb07db7032949798c761bbc13c661cb60ae3c98584d5d65 WHIRLPOOL 39d3b675968dc68ffd4215f0f9f0012b3c7e40538efa2aa93fe56822330ac581495673a08d39bced42689552456d80617cdbe30f2f436a832c7f33905b1a168c
+EBUILD vim-core-9999.ebuild 7070 SHA256 2d3cded51e9bdf194e2cf93fdd245675ad6ee5eecf46c3738030d37f450db231 SHA512 67f292c1163883544eff6d3cd73b20239452f203822623ec336a00217f0b591e46ddec4fca7582a98b5acf96e72d3822f5e8a066b91879e8d184fa6c66a25b2a WHIRLPOOL 41e263e3959d28f672a474db20a31be5f8f344973121f687596c778802f0e5f88e1b0b61637e899addabd59a1ac0d054b37c6790671f46db7fdc99a141b5067d
+MISC ChangeLog 63460 SHA256 aa49160403c9ddc75a20dae2d419f24cdd8f72d9bbe4e9ce23492e04fa8e915a SHA512 2a59f005e8062ee9f0c75b000c5bb5d612fda8aa21bc8b49f205d009b8a54cec18ad9ea7b9c78639a067f79e8b4f6d3fa627c4e432ecf190aa5fc984fde8f229 WHIRLPOOL 55cde22f06729084479e6bb362f26f21b95c71e45ab7ade914b0e0f30cfd3b8388e5a8d11db88858e0e0e101b96ed530689cc28a206e63b22faa359ced60390a
 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVgmFfAAoJEEqz6FtPBkyj4EcIAIFLj/XPkc43HLfSysBfdp/K
-1n5dgukc30WGl41mSbdY1eV7x/tUMR794Omf5Pik6RbmuPN74g37lDQVeszYhuIH
-a7WhUyCUikir42ghFBjn1Ai6AJGbEx1mCQZjLsrWfcpee0OmLWZUEC2tFnFS+gYe
-3Z/94O1VkT1nYfopP0hZv11Lq8cvPOrVXfVMinxsQoEYCjVGOF2VK6W2M7Hap4jw
-yig0dpPhtB4IPxNMkYaFcNaVhL/afVMn+I+f0MhO4BAD+RYDLqA5bxRXtaR7ZuMt
-lIkndaRVGg2Zc0vdPbx7HIAwzGMdvyRzOmndJFwuXSdgTL3eWfk1I8X8BGlNtf0=
-=f+YV
+iQEcBAEBCAAGBQJVgmWlAAoJEEqz6FtPBkyjVHoH/iR2BdLa4zO2K2g1op/OmWLB
+UsbghfiHF2fQvZ38wpZs0d7pL3JaUfC/e16F5zYUdr/PYE49B3x6bOq1YfV10mEE
+Ew3sXZbqHSkLFvCGjgg1nXLXl+zi1bO4GyowyMuBw2tS00tlU+SlkNQY0Ql0ZpgI
+MKIK67mjXSmkdmCaqirhoH2av7Pvw/ISQjV0dO/Zvd0BVOQFj9G49m16jfHlIT4O
+1Bi4Bh7HMa3fyb4F5M9UxNf81N31QTyDsVTid/Bz89sfRlDLABuhSEJp37UMpjDs
+zYtKH+cGpndiPqLvt4Wei+ZEec+1O0dVlwwsewrnFhY2Jo6h4KcxU3wgBv2nUkY=
+=yvaO
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim-core/vim-core-7.4.738.ebuild b/app-editors/vim-core/vim-core-7.4.738.ebuild
index 98add58d0b05..cf871776b57e 100644
--- a/app-editors/vim-core/vim-core-7.4.738.ebuild
+++ b/app-editors/vim-core/vim-core-7.4.738.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2015 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.738.ebuild,v 1.1 2015/06/18 06:12:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.738.ebuild,v 1.2 2015/06/18 06:30:59 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
 inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
 
+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 -> vim-${PV}.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-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 6082741ab109..24853cc51132 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2015 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.15 2015/06/18 06:12:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.16 2015/06/18 06:30:59 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
 inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
 
+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 -> vim-${PV}.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"