Use correct temporary build directory for live builds.

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

12 files changed, 69 insertions, 45 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index c1237a55ccf0..a1bcf280086b 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gvim
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.463 2015/06/18 06:17:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.464 2015/06/18 06:34:35 radhermit Exp $
+
+  18 Jun 2015; Tim Harder <radhermit@gentoo.org> gvim-7.4.738.ebuild,
+  gvim-9999.ebuild:
+  Use correct temporary build directory for live builds.
 
 *gvim-7.4.738 (18 Jun 2015)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 89e755fd7b98..e3c6d6e7eda6 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -19,18 +19,18 @@ EBUILD gvim-7.4.591.ebuild 12321 SHA256 84eb6c08c2c5c47e1466ed0c0a4c08abfd384b3b
 EBUILD gvim-7.4.622.ebuild 12360 SHA256 03f79a278b45f8d6b7f7fc6aaa319db2267eb886bcddce5a532acf2d5aa2c830 SHA512 c854123c4cd747e65d88d92259a121b660afcb9b93916631aee8ed001c47f663e3df50e620160b19c8e84c0b6c96f80cae040141475f98cf30bf34894ec10360 WHIRLPOOL 111ce23365aa9de51b499f49d28ee855c38f470ff33b890a3cf9260abdc4b96451fac184280978dafe2d41befc585cf3266b593b3ba30de7be6f8002280515fd
 EBUILD gvim-7.4.670.ebuild 12360 SHA256 502faabcc917210dd30347974589712784e0662dc280fc49041cc69dfeab9478 SHA512 2a827582777a3488cda3cba7a37bebd2fffe8e5a82e32b2ebc72f840e71c4afbd5e2ec96ed03261afc5d92e5518c114b4d66f9fa780590425620c3f02d7d9acb WHIRLPOOL 2af29d02d906d8942a2eb6a71ed5a3cf01c0d9f55b1ef6094db84aac273b95fbbc3cfa7f0368444c5119a783b524de78f36900de0675d7ed889acbdc2c9bb6d2
 EBUILD gvim-7.4.712.ebuild 12409 SHA256 0e7bc85e6ab82c99817e1d5b82fd8097a7cded38d89b0c4b914cc5aa1f3831ea SHA512 b5294ffefdabe5e331ea6e47c58f505b6460062a8613158529778a85a103187ea76de02f1a98335f077c1106279262f4e98e6d31791b499ba702e9f7a5b79220 WHIRLPOOL add20fa4fcd1c3ea348b456452ec3884ebdb67cd35ba40afa7e0d274906e9faaf1ea4c90af22cd7b966077f6682e322913d2cb32d47424abda597600560b9206
-EBUILD gvim-7.4.738.ebuild 12153 SHA256 1632a879cf2c77ff43aabe4446f667cf17fd717cd313df06539a5ad79e089cfe SHA512 73b40160aa39f110dc30edbd8ea72a4c084024364bc077920c7562c269f4729e585329e54e8159ac47909aad19845033f29c8b1ea5389cc6a4ca565e0ab052ee WHIRLPOOL c005c35826afa783287aba88ba80009c890afa5920504a26c424ad9f4376d077df701137553bb038213cf267f19147e68a5b69b161d02dbefa994255a3d2424b
-EBUILD gvim-9999.ebuild 12151 SHA256 61e64787db29b268a58f7c1041e6010b9790b1babf3a33393a782fd67b92d30e SHA512 48a38607db32d48821fc976e509825533e01104fce334cfc8fc94c536b847c921bd86bf5a9cdd4096e3c24f7d60aecd72a89365883415d52cbb816364bcc2e56 WHIRLPOOL 37f07c3118ca076317761c308ef2f19cf26c5c9c2ecea48ac42ddfd177c3ac800a364ffc10dcf3b8ce35fda2a27de6f73be2faed44d3b0a7bd1a01f47316b1d9
-MISC ChangeLog 63903 SHA256 5b0349475b48eb50f28d072ce4dce2efd6a3e3808b78c35d6daa8fbb41365594 SHA512 da180d325ebde3b01a30a8bb0f24187faaadd04913a7e43645f3a3aaee9d6ee95c60eb756f949e6489d12cd9a153458ed182d842f8ff0cbce7afb43f93e01e44 WHIRLPOOL ca0f87f2a6f8c474731183b947ff129cdda1ba950f83842bd16ef35b0127f219da9342006a551ce2fbc9927ec14877ec06f596790bcaea14a529f73099a57f46
+EBUILD gvim-7.4.738.ebuild 12196 SHA256 5ecb5d18704f6ca2d0051956945dec0c50f71ca6e7d40a98f7bd29f09e15a3ca SHA512 800783b643fde93433b66c69dbe39f195b5bff782dd42d75b5cf18ad8332f46dc602f4a47622a806c2e879b93dc1c3662a4d32a1330fb1ac16b42d571e1727f2 WHIRLPOOL ebeaa445888d8e8da6a6b3f49b76ccf516d1f0806a38ad9aa219b629bad9de71f356ab3f5b4d6d67c5284a7839fa8a0a39af239dd5a58315d7c2e896373ca358
+EBUILD gvim-9999.ebuild 12194 SHA256 bc708dff0147074286532a6b232981a2f911cdd305c3be978b0addb65a23e11b SHA512 2b21d87fcf62743ff424b625ecc049518966254acdf426861411e3b0ed051f487d3b735bd486fcf22708a6aa87fefff88623c2e65807e1787b3db3ee447a2f03 WHIRLPOOL a57258d4a9c9e127e969d4eafbf058e8af25b602faadcf1f831c53edb67c27d05a134034d12b4ed2ab02324ed4edb0ae75b90b32be6be025467d88456b922284
+MISC ChangeLog 64051 SHA256 80da183ced5cbc546e3ce59ded2e9c97ebc5671b7de9e10a558f8c5c5724cab5 SHA512 ba4d40ff5539124af99e8a483b0e17725f54e0faa2b0a2bc9f665af8982b7d50014179a52f8388042c02846b39dd9d02d643cd8a72dc133181463aa052ecefdc WHIRLPOOL 26191f435777a9b31bf17132fd23fb0a912a1cc80d2bfe3d1d15ebc7bcafe48a6ec5fa1d1ab6e4903bf48a192f14f013a4d1e674f5c6fa6483fe8bf3d7c95efc
 MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVgmKSAAoJEEqz6FtPBkyjNFAIAIfDGqrutY3JNtoWyr9rM7CV
-XL5v4V1EZeRdPJts83hQATVeNZUKvlld2Y8exRm2FHAd3jl2Gx5IVhP/vMDnOHEk
-iYxic1xpMh2KOR6bSE4UqquluYHPsUpSmIJ/YLN7hjbY5QWnXIAI52o5jPltvbfO
-J6doci6k5XL68F5QBkmVNaKDZ/+KUDubXSmoD2K0QWOJnPyu1rW1VQXFHr3LDLGJ
-Rw+MWzPuYnczSZuNhszwKbaA0v8qDMXzVZpn40hj+9R+k5XPVgsbvw6n3pyriK3b
-R+x6XlvNGy0pmgCgMhtSZKld3PVOORSHkOe4J4AYEUupZ2z74wNGjLcXZpHkjcw=
-=U97P
+iQEcBAEBCAAGBQJVgmZ8AAoJEEqz6FtPBkyjtiwIAKxo6YWNGL1Vxxa71CvoiXJd
+Xa1pciRtsLlejhJLSzSTttWzlHHiUP7s0LpCzKAfIm65dItVmD2yhyFnGuKxh13h
+GVOGUxuKfL1fyRPx+bo0sY3AaGuJLfnuMi05Lfu7gO3n/KRwjgWgWPVVKRrC5lqW
+3v63OaAkEBvsijz84suYEk75S+IaNk+vDv99qSowK/xRaXuK8OQ+tnK54qIM9wPU
+kOkpeOwVpXRqNNscZmUdAd9LV6ZeTmEyd+fVVxvuIV8nTGD3EqDBeWVkBCk1ccE+
+5tTDqxkD6CvGgNWFoiqMhaSc5oB9R3ewrPdThvy9r6GeHEtJXDvjtjg48imWk5w=
+=FBEF
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.738.ebuild b/app-editors/gvim/gvim-7.4.738.ebuild
index 2f481e862916..5b1af943b1f5 100644
--- a/app-editors/gvim/gvim-7.4.738.ebuild
+++ b/app-editors/gvim/gvim-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/gvim/gvim-7.4.738.ebuild,v 1.1 2015/06/18 06:17:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.738.ebuild,v 1.2 2015/06/18 06:34:35 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 prefix 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 -> vim-${PV}.tar.gz
 		http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-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"
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 9730226d399b..1c182ede2736 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-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/gvim/gvim-9999.ebuild,v 1.32 2015/06/18 06:17:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.33 2015/06/18 06:34:35 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 prefix 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 -> vim-${PV}.tar.gz
 		http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-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"
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"
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"