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/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/Manifest b/app-editors/vim/Manifest
index 030db066ae77..f6df98e75536 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -15,18 +15,18 @@ EBUILD vim-7.4.591.ebuild 11782 SHA256 128294473a077585ca9cc42be1253e4d6435a218e
 EBUILD vim-7.4.622.ebuild 11824 SHA256 59fa9cb8e2c68b1e45e0a373d6b0357769ff84fe0c7f31aa3958a953f7c31d08 SHA512 8ff58fccf512e60a60467219e02a3f91cde94ef946b70c9d434ab38a76174192acd20a5b8a4d150c2cec7209d7902ee4ec533df5f7023bc7429424cd17bada75 WHIRLPOOL 9b8a741250a2dedc94d5311d6ba8ac04221c4b6f625950e126fd1820df964b457222aea931c43b8359e23789d8a7382928d966c14bb01374a82718591a8e7e06
 EBUILD vim-7.4.670.ebuild 11824 SHA256 aaee06a165d34c07de4c7a5f61f6800e2931c337ed378eebaab2b1c30be6635c SHA512 abc9c5476facb773f48ff7b05dbf13e9176e979290458cc27bf8c24a11350dde4b2aeb30283dd9a06e00395b00347dc201216ec22bcbace0267173a8fe417104 WHIRLPOOL a97d951e734d7c1788be7abbb165ca78adb9a8a613429ca4f0c2882417745753a8d0d3aac2c696ef448fcae446e397ca814cfc8135816af2a94ec842a60bf315
 EBUILD vim-7.4.712.ebuild 11835 SHA256 650f6760f232d3929be03515bb8d8952f1d79703330fdff230d61650590318a0 SHA512 e094696b268a8b6f9479e5d7828b17e7a68effed7800ea1a3af8efb6f6075762161daba7d36841d4bce64ce828ba2df6198c3ee60f20a21b7ba687914c9d4fee WHIRLPOOL 518e3abebae020ea0d4f40cbff1b046351f44eae24b6aa25093a88f4191f7a894c2ba9864e33656523cedb70aa31c841a073e497411021e6bcc2e42092091d3a
-EBUILD vim-7.4.738.ebuild 11574 SHA256 3ac255a0dc50ab8e78f0853617cebefd06711b89af8f14e6a443e1f09ee51756 SHA512 bb03956f6e6d2318af23c96a0cef7467953b63a35105e89053b3b595e53017084d6ebe8f4f1aacd855c7c065c460cec5dc98070698bd078d44f1a734703e26d6 WHIRLPOOL 52dd8daf24b9766e2c162400a032fb5651f1d8fdec87d0d90d28c53df30373b57be0333608ef328c1edbf65f64f5901f06a3767cf73f59807b7cadc0ae873d50
-EBUILD vim-9999.ebuild 11570 SHA256 637e35d184538a19f7c0b3ef21e01ee83c19529f88440dbc40cda8a4cd348258 SHA512 abe0cbecc5b2f32fa18d9e942e3dee005ea3de91cf847a92e7736080cf165ced5b45feba9761cc27b9a99b0a058a075677f7bdfb990b1a8b53556aabcdcab849 WHIRLPOOL c3dc6d55483a6922e3af10a6d6f964f5cfacdb38fd14c706887c9e3a6f117f4653c406a2067edf7a521b37b6d2d6ff3bdd53f3e35ef7d4be8612821afb2e281a
-MISC ChangeLog 67408 SHA256 a15f0b0c0f0d1000bbf0269afce1d404899b599edd9cb3b18333b0310c5b0ee8 SHA512 139a103ab856f923199c29fe5c87e9b43e43aed50971280736d6e4c9a0ff3c457f5b90b6380c69b16261ede9a60ae7580dcdeb4945ac0fff77fd3e17f8698031 WHIRLPOOL 3c2cc241a962b55537ae656570ac5b107643a363efe91daeec1b7ec232302bfd02e439045f00daf4d392ad45d383c334896034aabd9987603497a481a78b6932
+EBUILD vim-7.4.738.ebuild 11617 SHA256 f396594c56690c973125ed7c12101e009fd0ceab75a500b915d01cae70fc3195 SHA512 8b31bdfea60fe89bdc2fa129f96f0bbdb2f8e38c07e3d344187ade92d0cff9ba9a63ad55617bbb9488aec5f822a4c19a4f9fd1025941d47d8ccb04bacf50878e WHIRLPOOL 86623257a75564bacffaa2b3362d9bf986a2120f6bd41030aa8de27cefd1074441e5ad8401e0b60a842f92e99f8f80538668a5dcb579b90b8a944e2dc352c798
+EBUILD vim-9999.ebuild 11613 SHA256 f7385a5274f6c415be20545c6e736b8f73c786005b3febc5481737d3aaa5e9e4 SHA512 fe45e31069c72175d97d379125226154e7b6ce71078eeeadd1b2eb3ad4cf78c5bc86d3101b46182b808b7ba019363ded53b50cde0914c97e654bf85ccda4be9a WHIRLPOOL 49a74ddea3550ae2031618e53e7a71a6d61f0d432f8b42bb692da88bae5c48f6eeb1371d8e911dd13aa6e75d125b708873e283b98ec1f5b52e84100c81345157
+MISC ChangeLog 67554 SHA256 de3e9925d46dd727e665ce20d47b21cb131a0475f81851021bb0c1d817fb1cfb SHA512 a793d2b7a6bb6cc8d9fa0c569bbc194deec90692930a261807c981b2e951301f2d266bae4bd923b23ef31161c57d9db1616004d02b2c6c367f1368fd4a809abf WHIRLPOOL dd2aed7c656b1a7cd190fe30421484bbe36a5a8ba18d9ecd8155a492af976ef41561b87937309dd7f009e605b09821f5905d29c5d3e8a134a028e86f47aed5ba
 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVgmIcAAoJEEqz6FtPBkyjpdIIAJrPZ8ATV0GzKnsiFjenmuAb
-Yhs1zEyg4RN5E8kHvqiz2oGK37xOItGfgXYxCAvJyFl4bwie+pYS1wjntBNtM6r9
-THkBeOdRhkrAbC/CkmfjI7ceEUDIKIXLl156nlre+zEQos+qb82dtDBORbwVLbtR
-BjJH965t7yNv/kdB3Uzp41cUFQczWYDpVpZWq0gCrXJtO6PDXFEZZfskWwGyBzZW
-xmLKvDSNspRTZONbGWIc7ppvHhsXC603i6+YRPAUEhDgZ4cgCGzX+RWYN8YZxWJb
-a0eRGkZ4J2UtE+XbTfyyR9m5oF7ySeU2B2NDR2U/EhOcG2JKSJ5tGFK/8bedhv4=
-=OhH3
+iQEcBAEBCAAGBQJVgmYWAAoJEEqz6FtPBkyjtysIAK741JEHOkEBuo0PqGV6P0+i
+JwbugkVEEDXXaTQK7tNG10Kh0426rkXZjfIdSN45nX38W5jqvsDTa7Dm3a2vq2GO
+qqMQN4MwASHW+J+V2p5dVCbyOfHoacKgJ/ufpTPpD3igrmJfrmWXdHQf2ZfogGKn
+9SQCSxgduY/PnF99V6mPo383bH1BSlZ/wEumgITj4EG4zyfaRCN66vrWzoda1aNz
+n71DlS8Rhuydsg2pSG7VRUbf0Ja8A6/ZaNuRjohQEVVUcpRU59653gfSqnoUB93f
+cPzZuQfQDgo/lfCggH/AVPKDmCHteSX+KSQjRkABsr5B8fdME0RM79g0hTgEbTE=
+=Wsxw
 -----END PGP SIGNATURE-----
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"