bump(app-editors/vim): sync with upstream

Update from vim 7.3.762 to 7.4.273. The 7.4.x ebuilds no longer use the vim.eclass which has been removed upstream. Updating vim in preparation for syncing the eclasses with upstream. Packages updated: app-editors/vim app-editors/vim-core
2025-08-19 05:21:23 +02:00 · 2015-04-17 12:29:00 -07:00 · 2015-04-17 12:29:00 -07:00 · 7b666d05b6
commit 7b666d05b6
parent c5911e5333
42 changed files with 1578 additions and 1554 deletions
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/ChangeLog
@ -1,6 +1,160 @@
 # ChangeLog for app-editors/vim-core
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.429 2013/10/15 23:13:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.463 2015/03/21 06:33:56 radhermit Exp $
  21 Mar 2015; Tim Harder <radhermit@gentoo.org> -vim-core-7.4.488.ebuild,
  -vim-core-7.4.527.ebuild, -vim-core-7.4.542.ebuild, -vim-core-7.4.560.ebuild:
  Remove old.
 *vim-core-7.4.670 (21 Mar 2015)
  21 Mar 2015; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.670.ebuild:
  Version bump.
  28 Feb 2015;  <tgall@gentoo.org> vim-core-7.4.591.ebuild:
  stable on arm64
 *vim-core-7.4.622 (07 Feb 2015)
  07 Feb 2015; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.622.ebuild:
  Version bump.
 *vim-core-7.4.591 (26 Jan 2015)
  26 Jan 2015; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.591.ebuild,
  vim-core-9999.ebuild:
  Version bump.
  05 Jan 2015; Yixun Lan <dlan@gentoo.org> vim-core-7.4.560.ebuild:
  keyword ~arm64, test on board
 *vim-core-7.4.560 (04 Jan 2015)
  04 Jan 2015; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.560.ebuild,
  vim-core-9999.ebuild:
  Version bump.
  08 Dec 2014; Tim Harder <radhermit@gentoo.org> -vim-core-7.3.762.ebuild,
  -vim-core-7.3.1214.ebuild, -vim-core-7.4.430.ebuild,
  -vim-core-7.4.475.ebuild:
  Remove old.
 *vim-core-7.4.542 (08 Dec 2014)
  08 Dec 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.542.ebuild:
  Version bump.
  24 Nov 2014; Tim Harder <radhermit@gentoo.org> -vim-core-7.4.52.ebuild,
  -vim-core-7.4.155.ebuild, -vim-core-7.4.169.ebuild, -vim-core-7.4.193.ebuild,
  -vim-core-7.4.326.ebuild, -vim-core-7.4.417.ebuild:
  Remove old.
 *vim-core-7.4.527 (24 Nov 2014)
  24 Nov 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.527.ebuild,
  vim-core-9999.ebuild:
  Version bump, fix locale installs (bug #527128).
 *vim-core-7.4.488 (26 Oct 2014)
  26 Oct 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.488.ebuild,
  vim-core-9999.ebuild:
  Version bump, make sed regex stricter (fixes bug #526682).
 *vim-core-7.4.475 (13 Oct 2014)
  13 Oct 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.475.ebuild:
  Version bump.
  12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> vim-core-7.4.273.ebuild:
  Stable for x86, wrt bug #511190
  19 Sep 2014; Agostino Sarubbo <ago@gentoo.org> vim-core-7.4.273.ebuild:
  Stable for ppc64, wrt bug #511190
  06 Sep 2014; Tim Harder <radhermit@gentoo.org> 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)
  05 Sep 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.430.ebuild,
  vim-core-9999.ebuild:
  Version bump. Use upstream patches instead of rolling our own (thanks to
  exherbo for the code) and fix cross-compile issues (bug #473372).
  27 Aug 2014; Agostino Sarubbo <ago@gentoo.org> vim-core-7.4.273.ebuild:
  Stable for ppc, wrt bug #511190
 *vim-core-7.4.417 (25 Aug 2014)
  25 Aug 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.417.ebuild:
  Version bump.
  01 Aug 2014; Raúl Porcel <armin76@gentoo.org> vim-core-7.4.273.ebuild:
  sparc stable, bug #511190
  20 Jul 2014; Tobias Klausmann <klausman@gentoo.org> vim-core-7.4.273.ebuild:
  Stable on alpha, bug #511190
  24 Jun 2014; Markus Meier <maekke@gentoo.org> vim-core-7.4.273.ebuild:
  arm stable, bug #511190
  22 Jun 2014; Mikle Kolyada <zlogene@gentoo.org> vim-core-7.4.273.ebuild:
  amd64 stable wrt bug #511190
  22 Jun 2014; Akinori Hattori <hattya@gentoo.org> vim-core-7.4.273.ebuild:
  ia64 stable wrt bug #511190
  17 Jun 2014; Jeroen Roovers <jer@gentoo.org> vim-core-7.4.273.ebuild:
  Stable for HPPA (bug #511190).
 *vim-core-7.4.326 (16 Jun 2014)
  16 Jun 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.326.ebuild:
  Version bump.
  06 Jun 2014; Mike Frysinger <vapier@gentoo.org> vim-core-7.3.1214.ebuild,
  vim-core-7.3.762.ebuild:
  Add arm64 love.
 *vim-core-7.4.273 (01 May 2014)
  01 May 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.273.ebuild:
  Version bump.
 *vim-core-7.4.193 (10 Mar 2014)
  10 Mar 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.193.ebuild,
  vim-core-9999.ebuild:
  Version bump, add support for user patching (bug #503328).
 *vim-core-7.4.169 (06 Feb 2014)
  06 Feb 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.169.ebuild,
  vim-core-9999.ebuild:
  Version bump.
  23 Jan 2014; Tim Harder <radhermit@gentoo.org> -vim-core-7.4.22.ebuild,
  -vim-core-7.4.41.ebuild, -vim-core-7.4.94.ebuild, -vim-core-7.4.131.ebuild:
  Remove old.
 *vim-core-7.4.155 (23 Jan 2014)
  23 Jan 2014; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.155.ebuild,
  vim-core-9999.ebuild:
  Version bump.
 *vim-core-7.4.131 (16 Dec 2013)
  16 Dec 2013; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.131.ebuild:
  Version bump.
 *vim-core-7.4.94 (19 Nov 2013)
  19 Nov 2013; Tim Harder <radhermit@gentoo.org> +vim-core-7.4.94.ebuild,
  vim-core-9999.ebuild:
  Version bump.
 *vim-core-7.4.52 (15 Oct 2013)
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest
@ -3,31 +3,28 @@ Hash: SHA256
 AUX vimrc-r4 6919 SHA256 9c59acc4c486a2aca5c6e5e297f13521a8ec57ebd540ec9ab846112fbb3e5c39 SHA512 f4ea9d2865e400d9b205ee8924b1152fa38434d1b73c67bcfceda18f737db8c8763701e12a3608465ef5409e74bfe6b5581a500577c826a16f3112bea49d63a9 WHIRLPOOL 7c7263db7b219cb845e15968c268c25614610696d6e5b6c508662b30640392aeb9f823ef4f74873ad2785dd354eb32ea612794ddab896f63bd4a24c53b38f182
 AUX xxd-completion 461 SHA256 580064ca4db3ac149fd89c743bd9946241220c211721f978f7a3ef97b3c171df SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c WHIRLPOOL 65324afb44612f1dd8f8850b7caa8524cff055d83aaad74c5b5030787463d0a95dbe0ce1b91c1a7b7f3e6954db3c0608ac2a2e1e75572af94e83758237b18447
-DIST vim-7.3.tar.bz2 9080692 SHA256 5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d SHA512 5560351fb005aae0be435a59de0218a8b4f494c8211a026838e8735a98d5010c395b9da6ec8c1ea31c75a94da7c6071f3eb0b7e5426f5beb75cc0d56ddb8d5b2 WHIRLPOOL 4ae549b9c6dcac34a676fa27dc1fb51e925d874fba932817eed8aeff56ad94d2dc4314219a94876b70776263575e1577bd80fb60a019bbd784c96ed74a5df822
+DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
 DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238
 DIST vim-7.4.622.patch.xz 816104 SHA256 f9d6624b7c8e5cbae749eff3f3bef30f7b10554fa04edf7fe3c85828b2b2e7a8 SHA512 544258cca6e46291743f95acba3dbc7844fddf0f579706cb7903f338b359b852cb4818238e7402e2b5413fa1a2ca9084246ffe39a7c23d29d14883594caa65c3 WHIRLPOOL 2b92e418892bc99c45e6b56592635804394e282c8f0959addf1a93434dccdfb06fa75f39f171624f484cc6a6420bfd6ea6a9d30b1b0a9694cb8a14cbf42e456e
 DIST vim-7.4.670.patch.xz 845000 SHA256 5ffbb05466c68aea08fda6067a6a46e068beece3e26d33098964e5e472439ec0 SHA512 04e2c54fe4b6afba6f8b123ef24d63e898667c808083b91ea5affa6607ad1661b081fa0bd6536a5a2260dbd2b818e7942ef3896719ed82fcc071355239cba536 WHIRLPOOL 6b632e757101d4a54989bd85c0b6186326573794504dc0dd0ebf25e14fca5827b4a884677c380381359968687e40d4aa4ea27b42d5419538a0e843c4356227e6
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
-DIST vim-core-7.3-gentoo-patches-r2.tar.bz2 3063 SHA256 cba8a43aea20457b9177be978ac875155288e6e83f05a3193f5dd381d56ec3c4 SHA512 0f4c12057dec787e10d38c3581181b7fe28f032fbc131674a37904afe196938b2e2de8611ee49c9f817cbf9ece5a537edb048a82442aad01500f6e2ad2617968 WHIRLPOOL 0c3cdf536b2ad9d1470fd78f5256b198470e864d05125c67a70e0de873cf2df353769750e7f41c8db0fb56a12a38ea7aa02e27278c1d216b7419cb213618baa6
+DIST vim-core-7.3-gentoo-patches-r4.tar.bz2 3015 SHA256 a4f61e4d0cd1848812f603e7f6b8a5304d13ac199f4e3061264cd3bec75a17c5 SHA512 0ba7a20dfdc2c24a92a4af5a6fe49a94d5d5c5e9111c42c4812d0cd52c26cc567acd2d7e74f66730afd3c4bc9f1667b0ad9c1f82f93d2844d8309b143f293676 WHIRLPOOL cec628c0f19971077677e667cc8903ea0a56041799a43907d47acc218fd9e0a6ea2a2a30999c74512fb36d233c6ac6d436f033684290155ff6ae70be5277bdbf
-DIST vim-core-7.3-gentoo-patches-r3.tar.bz2 3379 SHA256 2e0b38221b69d13c43cafb8c71f5be322785b12168278541a6006378c722e650 SHA512 7bebe548d1f65309f022bd459eb10364300cef9363298bf492c960730865b30b789392b123803fd3c3a5a3fb8543b9a83535c593b587a3e1f00290e9d2295714 WHIRLPOOL e75285549df9f4a9fa49cac19f0592ff4e5c87a07075dedd59f4806a104147bd9259de3e714b81b6d91bbbec9613c5f8dc3308649c8a38914cf29db22d539ac1
+DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a
-DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
+EBUILD vim-core-7.4.273.ebuild 7307 SHA256 b9ca490150e34c11c88c9c1689da45e88828ad45bab847d5052d79e44f909dba SHA512 71c9dd301b8035815ffedc0920c97edbd89c27f8380ed2192fa794e469dc50db385391305c1b7f162a472afb16895466ebdaec8422d6a35b6bd437b5c4519725 WHIRLPOOL 886dbc182aeec81d5a5457f11198b3965aef5e9f86961fbffba0d36db62c37465250ce9223b1e80cc9d962de4dd4de21563bf40ca6deadf07604410331f58a18
-DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
+EBUILD vim-core-7.4.591.ebuild 7280 SHA256 472bd4528d24e49a80030de2ed573d0d00773549f21aa424205e5880bb83f9f9 SHA512 5c94f9de098b5368b5c5a9c970ad71bc3968bbebfb5caafc7fa1d2e75a88d0ec3a06ec40ae479687dbbe30dfe001502875e4bea9cec1ebaf70d10f9f592780db WHIRLPOOL e9a1957a7335f9c376867395285a0bd5486ce5409b080e06ca30562769a9a49274ffce61cfb17373b74cbe1f43cb11fe4baf95a0d6dd42db6c34b78b473cdf2f
-DIST vim-patches-7.4.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
+EBUILD vim-core-7.4.622.ebuild 7285 SHA256 9bb92aefe746df6bf35159f919beff75643f80416e79bf54283c35d737adf8b6 SHA512 467eefa8956789ec9b6efaf0958a0f4d16dfb3f1a6327009a7c021a3bf72648dae1a563d59addc097731d3f140a42a31e4cfe9822e36b221bbbf24df8da7abf8 WHIRLPOOL 4fe446cd52643a3efbc1847b6e64ea33aa58877e1d6b2b52f9a59807ff68d3c63f732dd9122d22f88c5dc41af0437359b8b1f1d2d63e0383fd983c82d4e5a28d
-DIST vim-patches-7.4.41.patch.bz2 72664 SHA256 00eeef3f3f7ce8f2c8ffa163a85fecced465e0a66de3c3cc8963322c8b894b72 SHA512 79ca4b7662c01120471c86d6649904e3d9c68c28958ca96a0548fd3411cb8c678b977acdd4d42977ba6c823efd3e16e765a31a8575c081a32b651b63dfedd710 WHIRLPOOL 5ea5c8a7e08f57603f1c0df43e4e187f60b0a17c5c549999e8d79d8de15365168fd38c5f28fac32af5d57f5869cf132a49171f4af6d4cc769f878207c8fcfa94
+EBUILD vim-core-7.4.670.ebuild 7285 SHA256 3517c9615c476b15078f8602747241675a60a2284a56bdae3813ab2ee3cf8e25 SHA512 93bd5938d48c550705c048948c6de2f0eb0d17d737610bb0ae94bcb794a529a3d2fe50f5a8fa7442e193d7942082995cb70a4046752bd87c3ae85455ad74bb83 WHIRLPOOL faaa25c9c272ee036faa30d9158a537152a4673f930a8f5b9ce8106c315c09fa756292526c01a459f293dce5ff73c1d9296f12d43ee223b0029849599d7405dd
-DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
+EBUILD vim-core-9999.ebuild 7281 SHA256 1c2447ac314f57288405a460470ef0f85b720991d8c70d1a17d00f5533f8597c SHA512 c045c66c69024d2ac0b6c6f3e48d4dad58496ad54ac30e27e6fb416bb6e397826b539cfd6abf118e7bd14a758b49eee6baa66f00af9e1f56f2b0b52cafacac55 WHIRLPOOL 8e192352ea56a0900526748f86231ddb7d6da42a3233bfb3df81559f7d8cd818118f159857d45f47d13f4af07f63f5306fb6bf57291daa10e5bb0cdd8eb5abc6
-EBUILD vim-core-7.3.1214.ebuild 999 SHA256 59b89f0f425d5d2b874c9b2e53323b0e15fda44fdda04f9b6ddf675f0075a731 SHA512 396b2afdd5a86fde201c00cf93b9a9669b2bbb5ae5f3814909d829e86afc7237955434f2e99bd9b2aca73feb462719d0bc91947e0ef33c7770b92e7fffbd931f WHIRLPOOL b97d3e1af7cd481bd69352d447938d88bc7e717fa79f877accab36082f22b5ba7279d50195bab67c0cc1c5c8311646caeda6e14c33f5e1ce9241fbc9278634d8
+MISC ChangeLog 63001 SHA256 a4c914d555ff96150d3f31a02b7ede966c5435a5d1f42dee71f703f0a7d8d09a SHA512 1629d167809be450fdba739712a076554e73c819d6e0c088909567d98424560972962570db6c47fe8fa32ce7aabf9dec39d3466fd06584314dabaf70147bfe06 WHIRLPOOL 4adc567ca704ff5e381a25fdb329c9d56ae7c205f6bfe622675870e17646522d72003a8d85bea0b5034a4daddf120c843ba0986bb6f2ac09f0ef7dd9a441cdc5
 EBUILD vim-core-7.3.762.ebuild 981 SHA256 90dc7fe6f060aa0832fb14635707c51bef58dea713fef0e1b475299ece29d3fa SHA512 b413a8c456ac6f1f0974701c05729ecde3ab3919e60b993ed4aa064f20abfbdaf1d556b588e6575708438fd5c94bba0576a5725e9c8346783684166db83f554d WHIRLPOOL 63b8bc9acc28d07a8eb180c5a88510cd59b570d318b24f437a16c32f2430cb3eaf5b3f298734c1e249b82f937c36bd8fa8095154c31f5184b59f2c2fd9bc5261
 EBUILD vim-core-7.4.22.ebuild 7409 SHA256 a8aa0b82f74302eb98451b97889de668dbe8184dda2b0c00d9a0f3687f0d096f SHA512 90c4af236c3ae849ae5ed320a99d4bbaf81d27b41acc60545e3649d029cb835c747a558be69081fe0768bbc5536d24258aa65ca6a19b033fe0b4b8ccd4d924cc WHIRLPOOL 31b0f6f11b6eaa534758fad1aada144c09707b1270bc1f23c7878df1ea7b571b501b8710829c2d73290cb1212ddaf5ab7985b881645755d957ef518af70d226b
 EBUILD vim-core-7.4.41.ebuild 7409 SHA256 9b1b52c4c123c646dc26c95fc154e607df9c53a4f2ec6deb4f34d53949b25e90 SHA512 9094f498a78cbaa34f9968c381f7e746b66f6dbd39e5f76bc52753f815c4bb153665bfc35c08bb1619639f29724e49f9ff2ac90abf24ae330b786b4d2beef163 WHIRLPOOL 5b9c068617eb74874898e22b195eb9303cd59d9cfce9cf572565dbeb05a1b1c1ef710dee9de2844d82b10425d9bda5af1ecba55c2f57b35fad8738f368c72897
 EBUILD vim-core-7.4.52.ebuild 7409 SHA256 31d591fcce20577af303ef2d7aef6f359a51e28e83880f22a5046245def77d60 SHA512 22b26ec530b9581b1c0617996630dc5f97485b6936ff749cf7459714a6bd077469e68cf334f5dcb412e4a33b2845e8fe260b209631ebc566c5a4c38529b1028a WHIRLPOOL 3fe3c8d1a7e14ff292866961900086f430b4b9eea77c0d69cb2ea03b32fb6c37bb1742a1cc1a10b06a097c613481b8766b587d781d710df2a85e01b04ef9fbc1
 EBUILD vim-core-9999.ebuild 7407 SHA256 4fdb4a730220575c8503af2a52fb5cf4c45cda56103730d008d76e469eb8981b SHA512 d5dcb7cd4c3f3b46b0259490e8f5319727bc78f48093cdd4404285d9166f8d91e74caaa6aae01dbbb08d8a42e6231a151eb588f16bf3a007b60d8f94eabbd51e WHIRLPOOL 47cf5701ad45fe9c984ebaad235d74f7db233d59c24dc0c48c48295462a59c28467c38c9378276d3752bb0bd72aef5eb2084f3f6fc040302a69a3146c13bd9e4
 MISC ChangeLog 58262 SHA256 03e0d119246e02fe0d7939e65af33c135aef091b3442c24ce6b8daf8beb91253 SHA512 9019879124e2dc4500c71cfa192366af7add45e8afa04ecf79725ed847e0394792408c560eaf5f4387504ff5467df43b45286ece0f313168543c85fef11be28c WHIRLPOOL 1070569ac73f74c2277776fc86d2013491ae74ba9fb0176b0a79dbc702795ee54b2112a152ac0d3f654362108fc6f8025b9bd439a7f8bfb1bb198b645d7f26ba
 MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iQEcBAEBCAAGBQJSXcwOAAoJEEqz6FtPBkyjlfYH/2NGDzvZ2/lGEtAbnFjMw9Rp
+iQEcBAEBCAAGBQJVDRDUAAoJEEqz6FtPBkyjNU4H/1vjKzRW3t+0V3BSFgKCKlQ8
-aBfEDBiXC7vD9u7BzXHetVUkmwQm+vLX1j9NOxeH/s9YALnEc7K+ulfn/dMqgttQ
+/jeIWlWcy/bHSffJ18T7JEvoN1nrkdc2P9jtPEj85ASTCQ6VXFHLqtQnCG8VusdI
-KHeQ18QcT+6NiieF488p68chSAUYJVcN90fHBJOL2bM4vGyrR4RvZl1IPPpm8/Uv
+cO0JzQBFKKPCOEpYwecjCxa9rgcdjvYQxa8n+jjJpDYHI0CNumjVLnwUg8vVG5hD
-TrzdluUn9fcrJ2NBjj+9xpg6d1Ai4yIEs7yf+EqopDuKlrm9dcACRCYgPzVTBtRa
+4823O4bwUJEejSp7DjRvW6/NBbT2y8blHkL6ve/oYBwqRf+/hbH9ZQzViW2QUg/E
-ToiygA7jJ0qfeNMhCW9TCebxT2cQCBlVSLU2yr2JZWiYCyahC0W36JScF5G1fX14
+W/Scj6ZdRoDYdanAOOCOjM2QByYZGaGXlowxNsfYfexmkj86wLC1X2CzbHPHkogU
-GEtlhtJ7Ki3YNWJNeXpHQf8OHzBmXQBDT7OS+mNBv9XcOVF3TNEzRyVM+iRTVfs=
+QYbJSbRGTNRrXaPzKdRwrH0GSCi1Ud/3CL2/757PXsxdi1M5vYXlpjwzl/PoSAM=
-=blqW
+=tLO3
 -----END PGP SIGNATURE-----
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.3.1214.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.3.1214.ebuild
@ -1,20 +0,0 @@
 # Copyright 1999-2013 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.3.1214.ebuild,v 1.1 2013/06/17 00:55:42 radhermit Exp $
 EAPI=5
 VIM_VERSION="7.3"
 inherit vim
 VIM_CORE_GENTOO_PATCHES="vim-core-${VIM_VERSION}-gentoo-patches-r3.tar.bz2"
 VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
 VIMRC_FILE_SUFFIX="-r4"
 SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 	http://dev.gentoo.org/~radhermit/vim/${VIM_CORE_GENTOO_PATCHES}
 	http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
 DESCRIPTION="vim and gvim shared files"
 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"
 S=${WORKDIR}/vim${VIM_VERSION/.}
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.3.762.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.3.762.ebuild
@ -1,20 +0,0 @@
 # Copyright 1999-2013 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.3.762.ebuild,v 1.12 2013/06/09 16:09:31 ago Exp $
 EAPI=3
 VIM_VERSION="7.3"
 inherit vim
 VIM_CORE_GENTOO_PATCHES="vim-core-${VIM_VERSION}-gentoo-patches-r2.tar.bz2"
 VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
 VIMRC_FILE_SUFFIX="-r4"
 SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 	http://dev.gentoo.org/~lack/vim/${VIM_CORE_GENTOO_PATCHES}
 	http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
 S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="vim and gvim shared files"
 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"
 IUSE=""
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.273.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.273.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.52.ebuild,v 1.1 2013/10/15 23:13:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.273.ebuild,v 1.10 2014/10/12 09:02:05 ago Exp $
 EAPI=5
 VIM_VERSION="7.4"
@ -14,9 +14,9 @@ else
 	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/${PN}-7.3-gentoo-patches-r3.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r4.tar.bz2
 		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
-	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"
+	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
 DESCRIPTION="vim and gvim shared files"
@ -59,9 +59,6 @@ src_prepare() {
 	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
 		|| die "mve.awk sed failed"
 	# Patch to build with ruby-1.8.0_pre5 and following
 	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
@ -103,6 +100,8 @@ src_prepare() {
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
 	epatch_user
 }
 src_configure() {
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.591.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.591.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.22.ebuild,v 1.1 2013/09/06 06:20:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.591.ebuild,v 1.2 2015/02/28 22:26:04 tgall Exp $
 EAPI=5
 VIM_VERSION="7.4"
@ -11,12 +11,11 @@ if [[ ${PV} == 9999* ]] ; then
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
 	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-		http://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r3.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
-		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
+		http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-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"
+	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"
 fi
 DESCRIPTION="vim and gvim shared files"
@ -43,15 +42,15 @@ pkg_setup() {
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
 			# Apply any patches available from vim.org for this version
-			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
 		fi
-		if [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
-			# Patches for vim-core only (runtime/*)
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
 			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/gentoo/patches-core/
+				epatch "${WORKDIR}"/patches/
 		fi
 	fi
@ -59,9 +58,6 @@ src_prepare() {
 	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
 		|| die "mve.awk sed failed"
 	# Patch to build with ruby-1.8.0_pre5 and following
 	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
@ -103,6 +99,8 @@ src_prepare() {
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
 	epatch_user
 }
 src_configure() {
@ -122,7 +120,7 @@ src_configure() {
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm -f src/auto/configure
 	emake -j1 -C src autoconf
@ -140,7 +138,6 @@ src_configure() {
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		--with-features=tiny \
 		--enable-gui=no \
 		--without-x \
 		--disable-darwin \
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.622.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.622.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.41.ebuild,v 1.1 2013/09/27 19:25:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.622.ebuild,v 1.1 2015/02/07 02:15:32 radhermit Exp $
 EAPI=5
 VIM_VERSION="7.4"
@ -11,12 +11,11 @@ if [[ ${PV} == 9999* ]] ; then
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
 	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-		http://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r3.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
-		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
+		http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-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"
+	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"
 fi
 DESCRIPTION="vim and gvim shared files"
@ -43,15 +42,15 @@ pkg_setup() {
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
 			# Apply any patches available from vim.org for this version
-			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
 		fi
-		if [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
-			# Patches for vim-core only (runtime/*)
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
 			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/gentoo/patches-core/
+				epatch "${WORKDIR}"/patches/
 		fi
 	fi
@ -59,9 +58,6 @@ src_prepare() {
 	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
 		|| die "mve.awk sed failed"
 	# Patch to build with ruby-1.8.0_pre5 and following
 	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
@ -103,6 +99,8 @@ src_prepare() {
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
 	epatch_user
 }
 src_configure() {
@ -122,7 +120,7 @@ src_configure() {
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm -f src/auto/configure
 	emake -j1 -C src autoconf
@ -140,7 +138,6 @@ src_configure() {
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		--with-features=tiny \
 		--enable-gui=no \
 		--without-x \
 		--disable-darwin \
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.670.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.670.ebuild
@ -0,0 +1,230 @@
 # 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.670.ebuild,v 1.1 2015/03/21 06:28:50 radhermit Exp $
 EAPI=5
 VIM_VERSION="7.4"
 inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
 if [[ ${PV} == 9999* ]] ; then
 	inherit mercurial
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 else
 	VIM_ORG_PATCH="vim-${PV}.patch.xz"
 	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
 		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"
 fi
 DESCRIPTION="vim and gvim shared files"
 HOMEPAGE="http://www.vim.org/"
 SLOT="0"
 LICENSE="vim"
 IUSE="nls acl minimal"
 DEPEND="sys-devel/autoconf"
 PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
 S=${WORKDIR}/vim${VIM_VERSION/.}
 pkg_setup() {
 	# people with broken alphabets run into trouble. bug 82186.
 	unset LANG LC_ALL
 	export LC_COLLATE="C"
 	# Gnome sandbox silliness. bug #114475.
 	mkdir -p "${T}"/home
 	export HOME="${T}"/home
 }
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
 		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
 			# Apply any patches available from vim.org for this version
 			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
 		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
 	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
 		|| die "mve.awk sed failed"
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
 	# This fixes bug 29398 (27 Sep 2003 agriffis)
 	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
 		"${S}"/runtime/doc/syntax.txt \
 		"${S}"/runtime/doc/tagsrch.txt \
 		"${S}"/runtime/doc/usr_29.txt \
 		"${S}"/runtime/menu.vim \
 		"${S}"/src/configure.in || die 'sed failed'
 	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
 	# this is NeXT, but it's actually just a file in dev-libs/9libs
 	# This fixes bug 43885 (20 Mar 2004 agriffis)
 	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
 	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
 	# correctly. To avoid some really entertaining error messages about stuff
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
 	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
 	# Try to avoid sandbox problems. Bug #114475.
 	if [[ -d "${S}"/src/po ]] ; then
 		sed -i -e \
 			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
 			"${S}"/src/po/Makefile
 	fi
 	if version_is_at_least 7.3.122 ; then
 		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
 	fi
 	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
 	if version_is_at_least 7.3 ; then
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
 	epatch_user
 }
 src_configure() {
 	local myconf
 	# Fix bug 37354: Disallow -funroll-all-loops on amd64
 	# Bug 57859 suggests that we want to do this for all archs
 	filter-flags -funroll-all-loops
 	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
 	# everyone since previous flag filtering bugs have turned out to affect
 	# multiple archs...
 	replace-flags -O3 -O2
 	# Fix bug 18245: Prevent "make" from the following chain:
 	# (1) Notice configure.in is newer than auto/configure
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
 	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm -f src/auto/configure
 	emake -j1 -C src autoconf
 	# This should fix a sandbox violation (see bug 24447). The hvc
 	# things are for ppc64, see bug 86433.
 	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
 		[[ -e ${file} ]] && addwrite $file
 	done
 	# Let Portage do the stripping. Some people like that.
 	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
 	# Keep Gentoo Prefix env contained within the EPREFIX
 	use prefix && myconf+=" --without-local-dir"
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		--enable-gui=no \
 		--without-x \
 		--disable-darwin \
 		--disable-perlinterp \
 		--disable-pythoninterp \
 		--disable-rubyinterp \
 		--disable-gpm \
 		--disable-selinux \
 		$(use_enable nls) \
 		$(use_enable acl) \
 		${myconf}
 }
 src_compile() {
 	# The following allows emake to be used
 	emake -j1 -C src auto/osdef.h objects
 	emake tools
 }
 src_test() { :; }
 src_install() {
 	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
 	dodir /usr/{bin,share/{man/man1,vim}}
 	cd src || die "cd src failed"
 	emake \
 		installruntime \
 		installmanlinks \
 		installmacros \
 		installtutor \
 		installtutorbin \
 		installtools \
 		install-languages \
 		install-icons \
 		DESTDIR="${D}" \
 		BINDIR="${EPREFIX}"/usr/bin \
 		MANDIR="${EPREFIX}"/usr/share/man \
 		DATADIR="${EPREFIX}"/usr/share
 	keepdir ${vimfiles}/keymap
 	# default vimrc is installed by vim-core since it applies to
 	# both vim and gvim
 	insinto /etc/vim/
 	newins "${FILESDIR}"/vimrc-r4 vimrc
 	eprefixify "${ED}"/etc/vim/vimrc
 	if use minimal ; then
 		# To save space, install only a subset of the files.
 		# Helps minimalize the livecd, bug 65144.
 		eshopts_push -s extglob
 		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
 		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
 		rm "${ED}"/usr/bin/vimtutor
 		local keep_colors="default"
 		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
 		# tinkering with the next line might make bad things happen ...
 		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
 		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
 		eshopts_pop
 	fi
 	# These files might have slight security issues, so we won't
 	# install them. See bug #77841. We don't mind if these don't
 	# exist.
 	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
 	newbashcomp "${FILESDIR}"/xxd-completion xxd
 	# We shouldn't be installing the ex or view man page symlinks, as they
 	# are managed by eselect-vi
 	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
 }
 pkg_postinst() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 }
 pkg_postrm() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 }
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.4 2013/08/18 18:12:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.14 2015/01/26 23:25:08 radhermit Exp $
 EAPI=5
 VIM_VERSION="7.4"
@ -11,12 +11,11 @@ if [[ ${PV} == 9999* ]] ; then
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
 	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-		http://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r3.tar.bz2
+		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
-		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
+		http://dev.gentoo.org/~radhermit/vim/vim-${PV}-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"
+	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"
 fi
 DESCRIPTION="vim and gvim shared files"
@ -43,15 +42,15 @@ pkg_setup() {
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
 			# Apply any patches available from vim.org for this version
-			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
 		fi
-		if [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then
+		if [[ -d "${WORKDIR}"/patches/ ]]; then
-			# Patches for vim-core only (runtime/*)
+			# Gentoo patches to fix runtime issues, cross-compile errors, etc
 			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/gentoo/patches-core/
+				epatch "${WORKDIR}"/patches/
 		fi
 	fi
@ -59,9 +58,6 @@ src_prepare() {
 	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
 		|| die "mve.awk sed failed"
 	# Patch to build with ruby-1.8.0_pre5 and following
 	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
@ -103,6 +99,8 @@ src_prepare() {
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
 	epatch_user
 }
 src_configure() {
@ -122,7 +120,7 @@ src_configure() {
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm -f src/auto/configure
 	emake -j1 -C src autoconf
@ -140,7 +138,6 @@ src_configure() {
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		--with-features=tiny \
 		--enable-gui=no \
 		--without-x \
 		--disable-darwin \
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/ChangeLog
@ -1,6 +1,214 @@
 # ChangeLog for app-editors/vim
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.447 2013/10/15 23:15:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.495 2015/04/08 07:30:35 mgorny Exp $
  08 Apr 2015; Michał Górny <mgorny@gentoo.org> vim-7.4.273.ebuild:
  Remove old Python implementations
  31 Mar 2015; Ulrich Müller <ulm@gentoo.org> vim-7.4.273.ebuild,
  vim-7.4.591.ebuild, vim-7.4.622.ebuild, vim-7.4.670.ebuild, vim-9999.ebuild:
  Update dependency after package move of eselect modules to app-eselect.
  21 Mar 2015; Tim Harder <radhermit@gentoo.org> -vim-7.4.488.ebuild,
  -vim-7.4.527.ebuild, -vim-7.4.542.ebuild, -vim-7.4.560.ebuild:
  Remove old.
 *vim-7.4.670 (21 Mar 2015)
  21 Mar 2015; Tim Harder <radhermit@gentoo.org> +vim-7.4.670.ebuild:
  Version bump.
  19 Mar 2015; Justin Lecher <jlec@gentoo.org> vim-7.4.273.ebuild,
  vim-7.4.488.ebuild, vim-7.4.527.ebuild, vim-7.4.542.ebuild,
  vim-7.4.560.ebuild, vim-7.4.591.ebuild, vim-7.4.622.ebuild, vim-9999.ebuild:
  Fix tcl/tk slotting
  28 Feb 2015;  <tgall@gentoo.org> vim-7.4.591.ebuild:
  stable on arm64
 *vim-7.4.622 (07 Feb 2015)
  07 Feb 2015; Tim Harder <radhermit@gentoo.org> +vim-7.4.622.ebuild,
  vim-9999.ebuild:
  Version bump. Re-enable supporting both py2 and py3 at the same time.
 *vim-7.4.591 (26 Jan 2015)
  26 Jan 2015; Tim Harder <radhermit@gentoo.org> +vim-7.4.591.ebuild:
  Version bump.
  22 Jan 2015; Tim Harder <radhermit@gentoo.org> vim-9999.ebuild:
  Add ruby:2.2 and drop ruby:1.9 support.
  06 Jan 2015; Tim Harder <radhermit@gentoo.org> vim-9999.ebuild:
  Sync KEYWORDS and remove old EAPI specific EROOT fallback.
  05 Jan 2015; Yixun Lan <dlan@gentoo.org> vim-7.4.560.ebuild:
  keyword ~arm64, test on board
 *vim-7.4.560 (04 Jan 2015)
  04 Jan 2015; Tim Harder <radhermit@gentoo.org> +vim-7.4.560.ebuild,
  vim-9999.ebuild:
  Version bump.
  23 Dec 2014; Tim Harder <radhermit@gentoo.org> vim-9999.ebuild:
  Drop duplicate dependencies and change lua prefix check to use usex.
  23 Dec 2014; Fabian Groffen <grobian@gentoo.org> vim-7.4.542.ebuild,
  vim-9999.ebuild:
  Fix lua detection for Prefix, bug #533362
  23 Dec 2014; Tim Harder <radhermit@gentoo.org> vim-9999.ebuild:
  Use array for configure options.
  13 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> vim-7.4.273.ebuild,
  vim-7.4.488.ebuild, vim-7.4.527.ebuild, vim-7.4.542.ebuild, vim-9999.ebuild:
  Package links to libperl, so add a slot operator to Perl dependency
  08 Dec 2014; Tim Harder <radhermit@gentoo.org> -vim-7.3.762.ebuild,
  -vim-7.3.1214.ebuild, -vim-7.4.430.ebuild, -vim-7.4.475.ebuild,
  -files/vim-7.1.285-darwin-x11link.patch, -files/vim-7.3.1214-python3.patch,
  -files/vim-7.3-interix-link.patch, -files/vim-7.4.193-fix-tests.patch:
  Remove old.
 *vim-7.4.542 (08 Dec 2014)
  08 Dec 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.542.ebuild:
  Version bump.
 *vim-7.4.527 (24 Nov 2014)
  24 Nov 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.527.ebuild:
  Version bump.
 *vim-7.4.488 (26 Oct 2014)
  26 Oct 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.488.ebuild,
  vim-9999.ebuild:
  Version bump, make sed regex stricter (fixes bug #526682).
  13 Oct 2014; Tim Harder <radhermit@gentoo.org> -vim-7.4.52.ebuild,
  -vim-7.4.155.ebuild, -vim-7.4.169.ebuild, -vim-7.4.193.ebuild,
  -vim-7.4.326.ebuild, -vim-7.4.417.ebuild:
  Remove old.
  13 Oct 2014; Tim Harder <radhermit@gentoo.org> vim-7.4.475.ebuild,
  vim-9999.ebuild:
  Sync live/release changes.
 *vim-7.4.475 (13 Oct 2014)
  13 Oct 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.475.ebuild:
  Version bump.
  12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> vim-7.4.273.ebuild:
  Stable for x86, wrt bug #511190
  11 Oct 2014; Michał Górny <mgorny@gentoo.org> files/vim-completion,
  vim-7.4.430.ebuild, vim-9999.ebuild:
  Install necessary bash-completion aliases, bug #521152. Update completed
  command list in the file.
  19 Sep 2014; Agostino Sarubbo <ago@gentoo.org> vim-7.4.273.ebuild:
  Stable for ppc64, wrt bug #511190
  06 Sep 2014; Tim Harder <radhermit@gentoo.org> vim-7.4.430.ebuild,
  vim-9999.ebuild:
  Revert to using a single, compressed patch file.
 *vim-7.4.430 (05 Sep 2014)
  05 Sep 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.430.ebuild,
  vim-9999.ebuild:
  Version bump. Use upstream patches instead of rolling our own (thanks to
  exherbo for the code) and fix cross-compile issues (bug #473372).
  27 Aug 2014; Agostino Sarubbo <ago@gentoo.org> vim-7.4.273.ebuild:
  Stable for ppc, wrt bug #511190
 *vim-7.4.417 (25 Aug 2014)
  25 Aug 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.417.ebuild:
  Version bump.
  01 Aug 2014; Raúl Porcel <armin76@gentoo.org> vim-7.4.273.ebuild:
  sparc stable, bug #511190
  20 Jul 2014; Tobias Klausmann <klausman@gentoo.org> vim-7.4.273.ebuild:
  Stable on alpha, bug #511190
  26 Jun 2014; Mikle Kolyada <zlogene@gentoo.org> vim-7.4.273.ebuild:
  amd64 stable wrt bug #511190
  24 Jun 2014; Markus Meier <maekke@gentoo.org> vim-7.4.273.ebuild:
  arm stable, bug #511190
  22 Jun 2014; Akinori Hattori <hattya@gentoo.org> vim-7.4.273.ebuild:
  ia64 stable wrt bug #511190
  17 Jun 2014; Jeroen Roovers <jer@gentoo.org> vim-7.4.273.ebuild:
  Stable for HPPA (bug #511190).
 *vim-7.4.326 (16 Jun 2014)
  16 Jun 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.326.ebuild:
  Version bump.
  06 Jun 2014; Mike Frysinger <vapier@gentoo.org> vim-7.3.1214.ebuild,
  vim-7.3.762.ebuild:
  Add arm64 love.
  01 May 2014; Tim Harder <radhermit@gentoo.org> vim-7.4.273.ebuild:
  Sync PYTHON_COMPAT.
 *vim-7.4.273 (01 May 2014)
  01 May 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.273.ebuild:
  Version bump.
  27 Apr 2014; Mike Gilbert <floppym@gentoo.org> vim-7.4.193.ebuild,
  vim-9999.ebuild:
  Add python3.4.
 *vim-7.4.193 (10 Mar 2014)
  10 Mar 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.193.ebuild,
  vim-9999.ebuild, +files/vim-7.4.193-fix-tests.patch:
  Version bump, add support for user patching (bug #503328).
 *vim-7.4.169 (06 Feb 2014)
  06 Feb 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.169.ebuild,
  vim-9999.ebuild:
  Version bump. Support ruby:2.1, fix lua dep (bug #500376), and force lua
  support to be enabled for luajit (bug #499950).
  23 Jan 2014; Tim Harder <radhermit@gentoo.org> -vim-7.4.22.ebuild,
  -vim-7.4.41.ebuild, -vim-7.4.94.ebuild, -vim-7.4.131.ebuild:
  Remove old.
 *vim-7.4.155 (23 Jan 2014)
  23 Jan 2014; Tim Harder <radhermit@gentoo.org> +vim-7.4.155.ebuild:
  Version bump.
  27 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/vimrc:
  [QA] Remove unused files. The vimrc file has been moved to app-editors/vim-
  core a while ago.
 *vim-7.4.131 (16 Dec 2013)
  16 Dec 2013; Tim Harder <radhermit@gentoo.org> +vim-7.4.131.ebuild,
  vim-9999.ebuild:
  Version bump.
 *vim-7.4.94 (19 Nov 2013)
  19 Nov 2013; Tim Harder <radhermit@gentoo.org> +vim-7.4.94.ebuild,
  vim-9999.ebuild, metadata.xml:
  Version bump. Add racket use flag (bug #350887) and selinux use flag (bug
  #490270).
 *vim-7.4.52 (15 Oct 2013)
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/Manifest
@ -1,34 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
-AUX vim-7.1.285-darwin-x11link.patch 388 SHA256 0b935efbedabeab8439d42baa1d07b2f3d5e2964dea9e504ff2a4d4b9f3e6bcd SHA512 5fc5786abfc1258d29f3d37e89696dce8f4f770a889bebc4b287ee777cfb3e933025dfad015c9cd5984fcc355d06db4d95d45af768d2dfc5c76287a3ff5e04cf WHIRLPOOL b0e140078233ae10a944db92fc1268e9f73239ca045a89e5f4ed933859a97a075c20cfa3702b69eff807dfd0a10007c9051ccc272534438ebd7a504d359e1b29
+AUX vim-completion 1004 SHA256 8191a5a47e03de62d67ad6936259c8eb005e50b52d94994bcf4164e54ffefdae SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41 WHIRLPOOL 0f5d9ed640ecd3520c79e9abb4473bbca66f145106d2c997791eacf6f0f93131f102d55b2f056f87484c5d5ca781af958fd48f1a24e2c2c1a4ac1be378700f84
-AUX vim-7.3-interix-link.patch 530 SHA256 6d72a9b4f1ebe3876c31d9424aead4ec5946fd8051966c34ec51043751007c76 SHA512 6b7809628b389465f628d240889a4b42a3057991e34a02089da302fc65e9677f30a12b1ca6866b6fe5c770c0e62baafbe174ade69c7f004d0372be1e2a17bbb5 WHIRLPOOL 9e2f5405685ee92c4fca0ffd4e23e6b37473e1e9b921fdd87e91c29073b11f896f2fb1ddb3a21b66f1a2ba299dff4069af4632807a4abfdedf712bc28ded7ce5
+DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
-AUX vim-7.3.1214-python3.patch 780 SHA256 9c128516c92f178c844a6cf8447f6feb4246903bda2f0fdb368e19f6d87cba4b SHA512 79460f95c4a181f78144e2749bdc388e60a6ff7bf3efec346a0e3cf741c128d093aac8533e8fa76120ce9016de4e27d5c9b0d1ed1d93fa77614191c1fcc59125 WHIRLPOOL 42f17388e5c373725146e0bcf75f7df61d03c089c8cefc53f39a3407c974c86a3e4676ef0a6546ebbc1f5be7f1be220b9d442a8e37964f1c7e80b6dffddcf42a
+DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238
-AUX vim-completion 998 SHA256 bdca6069ef0fa995718f4b59fea85e58629259bb5a385d53e52d162d1463d4ff SHA512 785c94562a5d1781f8033947d96f623e0672939fe5bd8b6598a2230f53801ce5c70d36c55712f8a8bdc4fa9b2c51799123ec1448ec6ff4e22f046494156239b9 WHIRLPOOL 3d45145ae27455157476ad5e1d69dc34342ad587b918485cc78a69568c06d47d897e39383f2fe96202a792cde4e60f8e0fd1581df68b1ec4200e87a69d58b06d
+DIST vim-7.4.622.patch.xz 816104 SHA256 f9d6624b7c8e5cbae749eff3f3bef30f7b10554fa04edf7fe3c85828b2b2e7a8 SHA512 544258cca6e46291743f95acba3dbc7844fddf0f579706cb7903f338b359b852cb4818238e7402e2b5413fa1a2ca9084246ffe39a7c23d29d14883594caa65c3 WHIRLPOOL 2b92e418892bc99c45e6b56592635804394e282c8f0959addf1a93434dccdfb06fa75f39f171624f484cc6a6420bfd6ea6a9d30b1b0a9694cb8a14cbf42e456e
-AUX vimrc 3004 SHA256 b91b72f527db7f4f09340cd1e1107f10522ff71886d2fb9abb8eef99672e1145 SHA512 37c0cf068f539eb2dbf81ed87e0523c25f4784ed4f073251132d673cd27999b93a719baa268adaade0f19216f183eac4ce3568719c85f5ebefc0d25eecdc01a9 WHIRLPOOL 21b6785f5a32c03cc135efdb83800c00639c6cb062c028c036102b3c004650ef093eb15be2413bfc3017b9929a3b96e856a304d8f51f2690069582532912a19c
+DIST vim-7.4.670.patch.xz 845000 SHA256 5ffbb05466c68aea08fda6067a6a46e068beece3e26d33098964e5e472439ec0 SHA512 04e2c54fe4b6afba6f8b123ef24d63e898667c808083b91ea5affa6607ad1661b081fa0bd6536a5a2260dbd2b818e7942ef3896719ed82fcc071355239cba536 WHIRLPOOL 6b632e757101d4a54989bd85c0b6186326573794504dc0dd0ebf25e14fca5827b4a884677c380381359968687e40d4aa4ea27b42d5419538a0e843c4356227e6
 DIST vim-7.3.tar.bz2 9080692 SHA256 5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d SHA512 5560351fb005aae0be435a59de0218a8b4f494c8211a026838e8735a98d5010c395b9da6ec8c1ea31c75a94da7c6071f3eb0b7e5426f5beb75cc0d56ddb8d5b2 WHIRLPOOL 4ae549b9c6dcac34a676fa27dc1fb51e925d874fba932817eed8aeff56ad94d2dc4314219a94876b70776263575e1577bd80fb60a019bbd784c96ed74a5df822
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
-DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
+DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a
-DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
+EBUILD vim-7.4.273.ebuild 11562 SHA256 cbc64bcd5136f7c6059e379634e75117062204075001cf861d18a589c6f8535d SHA512 4be49b7831a6f4f3f439a50cd451d92ead238956cf4f6c8a6b6c139ba2d2d04037f1729a01b9ff4013052ff02559b9e67161483d8505b2a8368ed8eaf1363b60 WHIRLPOOL 75f388a488c53842f33b812ad68bf947ec4f51dcae1c7aa1a368ff73c4ed641233b3035432adc4ecf696d7a944ca044f4bf144fc21a48d7568dd5ae846d3b744
-DIST vim-patches-7.4.22.patch.bz2 11308 SHA256 573b9a1c039cff7522920ea5a0c8821033d92b20a6ff68b182480351a20e2d88 SHA512 533e4c4fb0b5e7f5d2b9585b08004748be617b73d8782f4442094342fabae1ac60ae55a4612724f4778057e0f4e10732276018e72c1c11cc91f241700bdf1bb7 WHIRLPOOL 288947dcaf303ea286fdf1f5c40996d611ea03a38dfd606892bd7b733f144971d27db02ffe5d2a5ed4d0809c2c33915498c29e5390e21dc55a6a9f47e3049ead
+EBUILD vim-7.4.591.ebuild 11782 SHA256 128294473a077585ca9cc42be1253e4d6435a218e3108c6ade27f6e77ea74cac SHA512 6d25bba81267cde8042edbad022d83e575935bcfc7449a4ec088ff24a9739ad59d257dc2c65c52e9965067e62206b2a0e706c1fef350b60bbf8b0bb39a7b5402 WHIRLPOOL 824930841411b5972f25f9de55f9280089fa3550bacdc314f1b2ab16462b4df325c7d900455df16cefd205a3524aa50b722b601d7575b43e03d8edf8baeef215
-DIST vim-patches-7.4.41.patch.bz2 72664 SHA256 00eeef3f3f7ce8f2c8ffa163a85fecced465e0a66de3c3cc8963322c8b894b72 SHA512 79ca4b7662c01120471c86d6649904e3d9c68c28958ca96a0548fd3411cb8c678b977acdd4d42977ba6c823efd3e16e765a31a8575c081a32b651b63dfedd710 WHIRLPOOL 5ea5c8a7e08f57603f1c0df43e4e187f60b0a17c5c549999e8d79d8de15365168fd38c5f28fac32af5d57f5869cf132a49171f4af6d4cc769f878207c8fcfa94
+EBUILD vim-7.4.622.ebuild 11824 SHA256 59fa9cb8e2c68b1e45e0a373d6b0357769ff84fe0c7f31aa3958a953f7c31d08 SHA512 8ff58fccf512e60a60467219e02a3f91cde94ef946b70c9d434ab38a76174192acd20a5b8a4d150c2cec7209d7902ee4ec533df5f7023bc7429424cd17bada75 WHIRLPOOL 9b8a741250a2dedc94d5311d6ba8ac04221c4b6f625950e126fd1820df964b457222aea931c43b8359e23789d8a7382928d966c14bb01374a82718591a8e7e06
-DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
+EBUILD vim-7.4.670.ebuild 11824 SHA256 aaee06a165d34c07de4c7a5f61f6800e2931c337ed378eebaab2b1c30be6635c SHA512 abc9c5476facb773f48ff7b05dbf13e9176e979290458cc27bf8c24a11350dde4b2aeb30283dd9a06e00395b00347dc201216ec22bcbace0267173a8fe417104 WHIRLPOOL a97d951e734d7c1788be7abbb165ca78adb9a8a613429ca4f0c2882417745753a8d0d3aac2c696ef448fcae446e397ca814cfc8135816af2a94ec842a60bf315
-EBUILD vim-7.3.1214.ebuild 1118 SHA256 5f2562a86a39ba99c79baf0b44173aba00e20013e249af74777ea9ba4bfaf751 SHA512 514233dab534cc49a4f318681e568ed059128352e94d748e1b38632340ed4576f6b0218367bc28024ec689e613c9fe180872054cde6e83a164227eace5568dba WHIRLPOOL 421d998ef49148b7efc77830126c8c2aa2eb7c2b0674752a24e60de289c2588f5b426847f8bed35951410c906d21c6b0d5fc9f814d81b5b8c1ce12277f3444b5
+EBUILD vim-9999.ebuild 11820 SHA256 cfc19bca103af412af3360236b51018ec657ac10daa8afc4de99b85119240557 SHA512 08dc40ad08bf27df24e5d62cc38604b17868de6cd06146530715685a0e03f001444e737ec42a9a65c594f3012c5d44890cbb9cce87097c5121be3271e391fcde WHIRLPOOL f27da42993ce505646b9f9eae4f47053d873e6c6562748e75a7111c2cc3ffa601609bac544c8f125736c1a87d76711fa48320867e271fe37632778908262a7d1
-EBUILD vim-7.3.762.ebuild 1001 SHA256 17cb878cf1c5922ac95d2d6c04215ae1bd695bff7a4ac742f92fbd0a8d688829 SHA512 2c7dbc515e74af5614e9a3290f61adb270c6f4dd0be4795f55a35d9d723c2bc7f3af4b890b571c21962be6585551b685dde68d6c1838368af7a1721ec87c1219 WHIRLPOOL 2a17ab2e9a9e903f1d2792d29d39086a8d3eb42c55683a409c6a6025ab2a5bbe1ca3750b5ac815164b293a6ecd59d187c37558e084baf66b4b6818d290800325
+MISC ChangeLog 67045 SHA256 f46ae912073ae45100de163c198657a53b56924bc26c368719a5d73365c16be1 SHA512 4cb86e4c8b5f5ae0deaa98843ee072b9072d36c76ba2fd0022b395f3ad90ad3e9eda312d1556ec8a2bcb7ad6e40610e05fcd83e550fa93c05d9efeb96b15cb89 WHIRLPOOL 8651ee35b8b9b7268d648e8c87086223410fa7a3dca54f0a8ef7d25f9767893e76a1aec494db2858ba0a624b509e27be8ba6c3c6626c20a4ed10b1a948bb122d
-EBUILD vim-7.4.22.ebuild 11685 SHA256 4e146f3f1543790176d4a4599c8cc5131424a381ce5e09708122932f439d067d SHA512 5e174be65ff70bde818a6d9b10fb721eb93d4c7a66f9b34acd77c260ca076960c3e999abcdee7ef1077756f97b7ef7bc1ee52a01da695ea6650b03d6a85bada4 WHIRLPOOL f556596dd8c4311496d6d444f3695e460e9c48b299ed7a0d9bb7ae7acd3b7f5852a85beaa0ef25da9d26c6c7df3cfb6622c103bd7e2ace9fbe5283da1b3f950d
+MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1
 EBUILD vim-7.4.41.ebuild 11685 SHA256 3977ee1e5cbbae717bca43b0c9f216576122189563accdd229fc7c7df915d894 SHA512 32fae016d1e17147adb762479feefc83df0ab398f5e18c20ab5a2a9ef6af84d7176a27ec8da305bcc57290dd2a1236ae21be71f1b5fab208b842c23d1745b2c5 WHIRLPOOL b07ed4e458db3fa01e3146c8f0b5fbeb01329a212124772080ddd44c8d97694dd219018d4c6c95dd178efa24df25b88d9ca6e816d30239b69ea03104a391825f
 EBUILD vim-7.4.52.ebuild 11778 SHA256 6c966f4d425286610619b546ea787222b4fdcdb619eefc017cc041c7eac16db9 SHA512 a4f7af2a712f6ac7f254b62597a25ce3b4e269d575531eae85df9d34fdb5315ccba8c1b5946d4eff210d3acc82781040f7309a176b79f25eb6886bf94bf0fe77 WHIRLPOOL c1e4bfa5d5ae42f9df88a237903190d7658eaaaaf37b05c5b4addbc56c3064556ba630e923a1b3037f5f7800b35287ce6b2cc2bd800099e079094b820e749545
 EBUILD vim-9999.ebuild 11776 SHA256 dd279d6aac979c8a30aec69a6e78fc13bb7737c3d6c6ccc9896f327e375bcbbe SHA512 ef2c432e6233a93079e605df61ffc6dd8226726e83f80c7e5542fa16b414a4d9b98574a838a1e0fb73865657266613318efb8f89cb8440bbedf474ab1a6b1deb WHIRLPOOL 8553d680e9919fca6a0d9e9d68f4c4b3bbbd8375abc7938c0c3ef3ddcb52b68de52e3b961009f73829a5cd5eb33c5961423f96d930462503806495e473affcb8
 MISC ChangeLog 60218 SHA256 2097700f3c6633e568ee382bb4f519b783ecb058a8919f1e780d0d48910a9d2b SHA512 9549cd06337a150b056f087bd096beae063554698c958fe186a2ad4d3192adbba2e9c852f9f4a4b02263179260fbd75e73a5b5da4db721c286e8cb7017a27ce7 WHIRLPOOL 84d59c57a27da6a6dbc26834650de6165fbebad44a1e4240dca08af1d788273db4e00f6c0a51694c5bb9cdec50cd36f7ef0e984a50b911f79a90fcfe7d0032a7
 MISC metadata.xml 523 SHA256 b75a53f2927616d5ceb6fdef13bc77f5852e80d4dd0305c52c80c3b6999ba83b SHA512 a649323d51eac150924004665e99a2c99b2900524773a3a6a15e3fef7b856f6c6c2d0efd8e2213e202eb66a28432a171dd62346be045faa884e72a1a78ce8338 WHIRLPOOL b99bc6b2bd37665a8629f647b528473734bddd7f639e66e8213da75452822e3177273b23ef5be2b76a28e46216ce42b398d3d4529dc724e95049477f920dcd70
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
-iQEcBAEBCAAGBQJSXcyaAAoJEEqz6FtPBkyjahsIAKc8LDZzn3JJRjTpIG/VuB/W
+iQJ8BAEBCABmBQJVJNl4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-VLTr2LeY1ZSorBVXT2Pytqzdv9L7cYcDGam/80ALALPt7K+7LLSdecUZFPHBuVA6
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MsA3u+P5lA8iFu5QyZoWO1n9sIkiwqi8vIpQaRY57Kz4mNwt0qHcE0nqZw2YM0Ng
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7p8P/ipbi3kXhCSoh9SjHl/CQWwY
-hCV69AdD4CK6BfZGT4Iv8BtUwFd6Vv2CqYsEiac7gvO3humqF3krI3eG+akZYB4b
+lkvRF1I/tACofRQ7tiw/BFyEhYM7ikws5mM5V4xxVbQgLlbXDWTPRUpmdb6TNKPa
-pSvF2GPkXC9su8Lo+rMdBZwM8dG2aMsIGotFLsPzZ45yAOlXpj9EWq4lA5HMNhnz
+6crFSrgg6hNvka6Ge417o3pxak9Qf8KAEosrMmcjztivoN2+YkislxiihcIrtBEs
-j1U8Yw5x07m1L+Dw2u60aRwpsfbCVvM8OmuhsMdC6zgUhNGXYpUQnCGWibDfYz8=
+AovbqFk6oQlDMyIBI588ROPb6HjSbuHdxBOFuLUMI3gne3O0jL0SqC1HbENThoCA
-=DInd
+FveqEAf5vlkLjdzstB5Pu2pJ5rib+rUd9qisK0ipUoOLNgfIiOOI5RdjmIe39nTW
 B3I/INWjmXA5e/gC/6pAOsm+q/EsQw+w7PQsox83pdiEM9eubx992uXr/kYVvjiU
 NaA6tBumuWAnl2spt0NS6Lm4yFHB+QnpYC3QNu8Y5Zft5SOAZG219F8ZKetrrcGx
 8T7XilnLrR670M9pOjynhLPP8naksYSk0Dxprg2CFkVWu2tmBxVSzFJujQlFosEu
 pBxKnUI1fypIRI2iRySiLveUxB7ypIJXDAOLfCNizvJIymojFjwhs42I/0h8bHsx
 +bnePiEdAkbZzcGE4YEm2Zji+kxSarXeBXhMw8vq4tBnOCUmg/kO1T9ftJxogwZv
 ZMTV6cEOmmVHm38We5YRM7JJqzxelSdr6Rm0LBF4F68T2jej+wyLrCDTEqIkzG+D
 wre6tceFjvpXrnuZmF5y
 =iKtX
 -----END PGP SIGNATURE-----
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-7.1.285-darwin-x11link.patch
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-7.1.285-darwin-x11link.patch
@ -1,11 +0,0 @@
 --- src/configure.in
 +++ src/configure.in
@@ -2701,7 +2701,7 @@
     AC_MSG_CHECKING(whether X_LOCALE needed)
     AC_TRY_COMPILE([#include <X11/Xlocale.h>],,
 	AC_TRY_LINK_FUNC([_Xsetlocale], [AC_MSG_RESULT(yes)
 -		AC_DEFINE(X_LOCALE)], AC_MSG_RESULT(no)),
 +		AC_DEFINE(X_LOCALE) ldflags_save="$ldflags_save -lX11"], AC_MSG_RESULT(no)),
 	AC_MSG_RESULT(no))
   fi
   CFLAGS=$cflags_save
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-7.3-interix-link.patch
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-7.3-interix-link.patch
@ -1,12 +0,0 @@
 diff -ru vim73.orig/src/link.sh vim73/src/link.sh
 --- vim73.orig/src/link.sh	2010-10-21 16:29:07 +0200
 +++ vim73/src/link.sh	2010-10-21 16:23:15 +0200
@@ -41,7 +41,7 @@
   if sh link.cmd; then
     touch auto/link.sed
     cp link.cmd linkit.sh
 -    for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w perl dl pthread thread readline m crypt attr; do
 +    for libname in dummy; do
       cont=yes
       while test -n "$cont"; do
         if grep "l$libname " linkit.sh >/dev/null; then
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-7.3.1214-python3.patch
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-7.3.1214-python3.patch
@ -1,15 +0,0 @@
 diff -r 6e9667d3f166 src/configure.in
 --- a/src/configure.in	Sun Jun 16 22:49:14 2013 +0200
 +++ b/src/configure.in	Sun Jun 16 17:47:30 2013 -0700
@@ -1107,9 +1107,9 @@
       AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf,
       [
        vi_cv_path_python3_conf=
 -       config_dir="config"
 +       config_dir="config-${vi_cv_var_python3_version}"
        if test "${vi_cv_var_python3_abiflags}" != ""; then
 -         config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
 +         config_dir="${config_dir}${vi_cv_var_python3_abiflags}"
        fi
        d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
        if test -d "$d" && test -f "$d/config.c"; then
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-completion
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vim-completion
@ -31,6 +31,6 @@ _vim()
    fi
 }
-complete -o filenames -F _vim vim ex view evim rvim rview
+complete -o filenames -F _vim vim ex vi view rvim rview vimdiff
 # vim: set ft=sh sw=4 et sts=4 :
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vimrc
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/files/vimrc
@ -1,93 +0,0 @@
 " Default configuration file for Vim
 " Written by Aron Griffis <agriffis@gentoo.org>
 " Modified by Ryan Phillips <rphillips@gentoo.org>
 " Added Redhat's vimrc info by Seemant Kulleen <seemant@gentoo.org>
 " The following are some sensible defaults for Vim for most users.
 " We attempt to change as little as possible from Vim's defaults,
 " deviating only where it makes sense
 set nocompatible		" Use Vim defaults (much better!)
 set bs=2				" Allow backspacing over everything in insert mode
 set ai					" Always set auto-indenting on
 "set backup				" Keep a backup file
 set viminfo='20,\"50	" read/write a .viminfo file -- limit to only 50
 set history=50			" keep 50 lines of command history
 set ruler				" Show the cursor position all the time
 " Added to default to high security within Gentoo. Fixes bug #14088
 set modelines=0
 if v:lang =~ "^ko"
   set fileencodings=euc-kr
   set guifontset=-*-*-medium-r-normal--16-*-*-*-*-*-*-*
 elseif v:lang =~ "^ja_JP"
   set fileencodings=euc-jp
   set guifontset=-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*
 elseif v:lang =~ "^zh_TW"
   set fileencodings=big5
   set guifontset=-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-1,-taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0
 elseif v:lang =~ "^zh_CN"
   set fileencodings=gb2312
   set guifontset=*-r-*
 endif
 if v:lang =~ "utf8$" || v:lang =~ "UTF-8$"
   set fileencodings=utf-8,latin1
 endif
 " Only do this part when compiled with support for autocommands
 if has("autocmd")
  " In text files, always limit the width of text to 78 characters
  autocmd BufRead *.txt set tw=78
  " When editing a file, always jump to the last cursor position
  autocmd BufReadPost *
  \ if line("'\"") > 0 && line ("'\"") <= line("$") |
  \   exe "normal g'\"" |
  \ endif
 endif
 " Don't use Ex mode, use Q for formatting
 map Q gq
 " Switch syntax highlighting on, when the terminal has colors
 " Also switch on highlighting the last used search pattern.
 if &t_Co > 2 || has("gui_running")
  syntax on
  set hlsearch
 endif
 if &term=="xterm"
     set t_RV=			" don't check terminal version
     set t_Co=8
     set t_Sb=^[4%dm
     set t_Sf=^[3%dm
 endif
 if has("autocmd")
 " Gentoo-specific settings for ebuilds.  These are the federally-mandated
 " required tab settings.  See the following for more information:
 " http://www.gentoo.org/doc/en/xml/gentoo-howto.xml
 augroup gentoo
 	au!
 	au BufRead,BufNewFile *.ebuild set tabstop=4 shiftwidth=4 noexpandtab
 augroup END
 endif " has("autocmd")
 " some extra commands for HTML editing
 nmap ,mh wbgueyei<<ESC>ea></<ESC>pa><ESC>bba
 nmap ,h1 _i<h1><ESC>A</h1><ESC>
 nmap ,h2 _i<h2><ESC>A</h2><ESC>
 nmap ,h3 _i<h3><ESC>A</h3><ESC>
 nmap ,h4 _i<h4><ESC>A</h4><ESC>
 nmap ,h5 _i<h5><ESC>A</h5><ESC>
 nmap ,h6 _i<h6><ESC>A</h6><ESC>
 nmap ,hb wbi<b><ESC>ea</b><ESC>bb
 nmap ,he wbi<em><ESC>ea</em><ESC>bb
 nmap ,hi wbi<i><ESC>ea</i><ESC>bb
 nmap ,hu wbi<u><ESC>ea</i><ESC>bb
 nmap ,hs wbi<strong><ESC>ea</strong><ESC>bb
 nmap ,ht wbi<tt><ESC>ea</tt><ESC>bb
 nmap ,hx wbF<df>f<df>
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/metadata.xml
@ -4,6 +4,7 @@
 <herd>vim</herd>
 <use>
  <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
  <flag name="racket">Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
  <flag name="vim-pager">Install vimpager and vimmanpager links</flag>
  <flag name="X">Link console vim against X11 libraries to enable title and
 	  clipboard features in xterm</flag>
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.3.1214.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.3.1214.ebuild
@ -1,30 +0,0 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.1214.ebuild,v 1.2 2013/09/05 18:18:04 mgorny Exp $
 EAPI=5
 VIM_VERSION="7.3"
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit vim
 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}"
 DESCRIPTION="Vim, an improved vi-style text editor"
 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 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 S=${WORKDIR}/vim${VIM_VERSION/.}
 src_prepare() {
 	vim_src_prepare
 	if [[ ${CHOST} == *-interix* ]]; then
 		epatch "${FILESDIR}"/${PN}-7.3-interix-link.patch
 	fi
 	epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
 	# fix python3 support
 	epatch "${FILESDIR}"/${P}-python3.patch
 }
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.3.762.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.3.762.ebuild
@ -1,26 +0,0 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.762.ebuild,v 1.12 2013/06/09 16:09:43 ago Exp $
 EAPI=3
 VIM_VERSION="7.3"
 inherit vim
 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/~lack/vim/${VIM_ORG_PATCHES}"
 S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="Vim, an improved vi-style text editor"
 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 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 src_prepare() {
 	vim_src_prepare
 	if [[ ${CHOST} == *-interix* ]]; then
 		epatch "${FILESDIR}"/${PN}-7.3-interix-link.patch
 	fi
 	epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
 }
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.273.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.273.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.41.ebuild,v 1.2 2013/10/07 05:36:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.273.ebuild,v 1.15 2015/04/08 07:30:35 mgorny Exp $
 EAPI=5
 VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+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-single-r1
@ -17,7 +17,7 @@ else
 	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
-	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"
+	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
 DESCRIPTION="Vim, an improved vi-style text editor"
@ -25,32 +25,40 @@ HOMEPAGE="http://www.vim.org/"
 SLOT="0"
 LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python ruby vim-pager"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	luajit? ( lua )
 "
-RDEPEND=">=app-admin/eselect-vi-1.1
+RDEPEND="
 	>=app-eselect/eselect-vi-1.1
 	>=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )
 	acl? ( kernel_linux? ( sys-apps/acl ) )
 	cscope? ( dev-util/cscope )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	lua? (
-		luajit? ( dev-lang/luajit )
+		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	!minimal? (
 		~app-editors/vim-core-${PV}
 		dev-util/ctags
 	)
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
+	racket? ( dev-scheme/racket )
-	X? ( x11-libs/libXt )"
+	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
 	selinux? ( sys-libs/libselinux )
 	tcl? ( dev-lang/tcl:0= )
 	X? ( x11-libs/libXt )
 "
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-vi-1.1
 	sys-devel/autoconf
 	>=sys-libs/ncurses-5.2-r2
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
 "
 S=${WORKDIR}/vim${VIM_VERSION/.}
@ -78,9 +86,6 @@ src_prepare() {
 	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
 		|| die "mve.awk sed failed"
 	# Patch to build with ruby-1.8.0_pre5 and following
 	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
@ -121,8 +126,7 @@ src_prepare() {
 	# Try to avoid sandbox problems. Bug #114475.
 	if [[ -d "${S}"/src/po ]] ; then
-		sed -i -e \
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
 			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
 			"${S}"/src/po/Makefile
 	fi
@ -135,6 +139,8 @@ src_prepare() {
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
 	epatch_user
 }
 src_configure() {
@ -175,7 +181,10 @@ src_configure() {
 			--disable-luainterp \
 			--disable-perlinterp \
 			--disable-pythoninterp \
 			--disable-mzschemeinterp \
 			--disable-rubyinterp \
 			--disable-selinux \
 			--disable-tclinterp \
 			--disable-gpm"
 	else
 		use debug && append-flags "-DDEBUG"
@ -184,8 +193,14 @@ src_configure() {
 		myconf+=" $(use_enable acl)"
 		myconf+=" $(use_enable cscope)"
 		myconf+=" $(use_enable gpm)"
 		myconf+=" $(use_enable lua luainterp)"
 		myconf+=" $(use_with luajit)"
 		myconf+=" $(use_enable nls)"
 		myconf+=" $(use_enable perl perlinterp)"
 		myconf+=" $(use_enable racket mzschemeinterp)"
 		myconf+=" $(use_enable ruby rubyinterp)"
 		myconf+=" $(use_enable selinux)"
 		myconf+=" $(use_enable tcl tclinterp)"
 		if use python ; then
 			if [[ ${EPYTHON} == python3* ]] ; then
@ -199,20 +214,10 @@ src_configure() {
 			myconf+=" --disable-pythoninterp --disable-python3interp"
 		fi
 		myconf+=" $(use_enable lua luainterp)"
 		myconf+=" $(use_with luajit)"
 		myconf+=" $(use_enable ruby rubyinterp)"
 		# tclinterp is broken; when you --enable-tclinterp flag, then
 		# the following command never returns:
 		#   VIMINIT='let OS=system("uname -s")' vim
 		# mzscheme support is currently broken. bug #91970
 		#myconf+=" $(use_enable mzscheme mzschemeinterp)"
 		# --with-features=huge forces on cscope even if we --disable it. We need
 		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
 		if ! use cscope ; then
-			sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || \
+			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
 				die "couldn't disable cscope"
 		fi
@ -229,7 +234,6 @@ src_configure() {
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		--disable-selinux \
 		${myconf}
 }
@ -259,14 +263,13 @@ src_test() {
 	# Test 49 won't work inside a portage environment
 	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-	sed -i -e 's~test49.out~~g' Makefile
+	sed -i 's~test49.out~~g' Makefile
 	# We don't want to rebuild vim before running the tests
-	sed -i -e 's,: \$(VIMPROG),: ,' Makefile
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
 	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim nongui \
+	emake -j1 VIMPROG=../vim nongui
 		|| die "At least one test failed"
 }
 # Make convenience symlinks, hopefully without stepping on toes.  Some
@ -333,6 +336,7 @@ pkg_postinst() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		if use X ; then
 			echo
 			elog "The 'X' USE flag enables vim <-> X communication, like"
@ -350,10 +354,7 @@ pkg_postinst() {
 		echo
 		ewarn "Note that the English word lists are no longer installed by"
 		ewarn "default."
-	echo
+	fi
 	echo
 	elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
 	# Make convenience symlinks
 	update_vim_symlinks
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.591.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.591.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.22.ebuild,v 1.3 2013/10/07 05:36:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.591.ebuild,v 1.4 2015/03/31 17:37:10 ulm Exp $
 EAPI=5
 VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+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-single-r1
@ -13,11 +13,11 @@ if [[ ${PV} == 9999* ]] ; then
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
 	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_ORG_PATCH}
-	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"
+		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"
 fi
 DESCRIPTION="Vim, an improved vi-style text editor"
@ -25,32 +25,39 @@ HOMEPAGE="http://www.vim.org/"
 SLOT="0"
 LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python ruby vim-pager"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	luajit? ( lua )
 "
-RDEPEND=">=app-admin/eselect-vi-1.1
+RDEPEND="
 	>=app-eselect/eselect-vi-1.1
 	>=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )
 	acl? ( kernel_linux? ( sys-apps/acl ) )
 	cscope? ( dev-util/cscope )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	lua? (
-		luajit? ( dev-lang/luajit )
+		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	!minimal? (
 		~app-editors/vim-core-${PV}
 		dev-util/ctags
 	)
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
+	racket? ( dev-scheme/racket )
-	X? ( x11-libs/libXt )"
+	ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
 	selinux? ( sys-libs/libselinux )
 	tcl? ( dev-lang/tcl:0= )
 	X? ( x11-libs/libXt )
 "
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-vi-1.1
 	sys-devel/autoconf
-	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )
-	nls? ( sys-devel/gettext )"
+"
 S=${WORKDIR}/vim${VIM_VERSION/.}
@ -68,9 +75,15 @@ pkg_setup() {
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
 			# Apply any patches available from vim.org for this version
-			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
 		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
@ -78,9 +91,6 @@ src_prepare() {
 	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
 		|| die "mve.awk sed failed"
 	# Patch to build with ruby-1.8.0_pre5 and following
 	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
@ -121,8 +131,7 @@ src_prepare() {
 	# Try to avoid sandbox problems. Bug #114475.
 	if [[ -d "${S}"/src/po ]] ; then
-		sed -i -e \
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
 			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
 			"${S}"/src/po/Makefile
 	fi
@ -135,10 +144,12 @@ src_prepare() {
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
 	epatch_user
 }
 src_configure() {
-	local myconf
+	local myconf=()
 	# Fix bug 37354: Disallow -funroll-all-loops on amd64
 	# Bug 57859 suggests that we want to do this for all archs
@ -154,7 +165,7 @@ src_configure() {
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm -f src/auto/configure
 	emake -j1 -C src autoconf
@ -165,72 +176,83 @@ src_configure() {
 	done
 	if use minimal ; then
-		myconf="--with-features=tiny \
+		myconf=(
-			--disable-nls \
+			--with-features=tiny
-			--disable-multibyte \
+			--disable-nls
-			--disable-acl \
+			--disable-multibyte
-			--enable-gui=no \
+			--disable-acl
-			--without-x \
+			--enable-gui=no
-			--disable-darwin \
+			--without-x
-			--disable-luainterp \
+			--disable-darwin
-			--disable-perlinterp \
+			--disable-luainterp
-			--disable-pythoninterp \
+			--disable-perlinterp
-			--disable-rubyinterp \
+			--disable-pythoninterp
-			--disable-gpm"
+			--disable-mzschemeinterp
 			--disable-rubyinterp
 			--disable-selinux
 			--disable-tclinterp
 			--disable-gpm
 		)
 	else
 		use debug && append-flags "-DDEBUG"
-		myconf="--with-features=huge --enable-multibyte"
+		myconf=(
-		myconf+=" $(use_enable acl)"
+			--with-features=huge
-		myconf+=" $(use_enable cscope)"
+			--enable-multibyte
-		myconf+=" $(use_enable gpm)"
+			$(use_enable acl)
-		myconf+=" $(use_enable nls)"
+			$(use_enable cscope)
-		myconf+=" $(use_enable perl perlinterp)"
+			$(use_enable gpm)
 			$(use_enable lua luainterp)
 			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
 			$(use_with luajit)
 			$(use_enable nls)
 			$(use_enable perl perlinterp)
 			$(use_enable racket mzschemeinterp)
 			$(use_enable ruby rubyinterp)
 			$(use_enable selinux)
 			$(use_enable tcl tclinterp)
 		)
 		if use python ; then
 			if [[ ${EPYTHON} == python3* ]] ; then
-				myconf+=" --enable-python3interp"
+				myconf+=( --enable-python3interp )
 				export vi_cv_path_python3="${PYTHON}"
 			else
-				myconf+=" --enable-pythoninterp"
+				myconf+=( --enable-pythoninterp )
 				export vi_cv_path_python="${PYTHON}"
 			fi
 		else
-			myconf+=" --disable-pythoninterp --disable-python3interp"
+			myconf+=(
 				--disable-pythoninterp
 				--disable-python3interp
 			)
 		fi
 		myconf+=" $(use_enable lua luainterp)"
 		myconf+=" $(use_with luajit)"
 		myconf+=" $(use_enable ruby rubyinterp)"
 		# tclinterp is broken; when you --enable-tclinterp flag, then
 		# the following command never returns:
 		#   VIMINIT='let OS=system("uname -s")' vim
 		# mzscheme support is currently broken. bug #91970
 		#myconf+=" $(use_enable mzscheme mzschemeinterp)"
 		# --with-features=huge forces on cscope even if we --disable it. We need
 		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
 		if ! use cscope ; then
-			sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || \
+			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
 				die "couldn't disable cscope"
 		fi
 		# don't test USE=X here ... see bug #19115
 		# but need to provide a way to link against X ... see bug #20093
-		myconf+=" --enable-gui=no --disable-darwin $(use_with X x)"
+		myconf+=(
 			--enable-gui=no
 			--disable-darwin
 			$(use_with X x)
 		)
 	fi
 	# Let Portage do the stripping. Some people like that.
 	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
 	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
+	use prefix && myconf+=( --without-local-dir )
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
-		--disable-selinux \
+		"${myconf[@]}"
 		${myconf}
 }
 src_compile() {
@ -259,21 +281,19 @@ src_test() {
 	# Test 49 won't work inside a portage environment
 	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-	sed -i -e 's~test49.out~~g' Makefile
+	sed -i 's~test49.out~~g' Makefile
 	# We don't want to rebuild vim before running the tests
-	sed -i -e 's,: \$(VIMPROG),: ,' Makefile
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
 	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim nongui \
+	emake -j1 VIMPROG=../vim nongui
 		|| die "At least one test failed"
 }
 # Make convenience symlinks, hopefully without stepping on toes.  Some
 # of these links are "owned" by the vim ebuild when it is installed,
 # but they might be good for gvim as well (see bug 45828)
 update_vim_symlinks() {
 	has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
 	local f syms
 	syms="vimdiff rvim rview"
 	einfo "Calling eselect vi update..."
@ -323,6 +343,8 @@ src_install() {
 	fi
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
 	# keep in sync with 'complete ... -F' list
 	bashcomp_alias vim ex vi view rvim rview vimdiff
 	# We shouldn't be installing the ex or view man page symlinks, as they
 	# are managed by eselect-vi
@ -333,6 +355,7 @@ pkg_postinst() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		if use X ; then
 			echo
 			elog "The 'X' USE flag enables vim <-> X communication, like"
@ -350,10 +373,7 @@ pkg_postinst() {
 		echo
 		ewarn "Note that the English word lists are no longer installed by"
 		ewarn "default."
-	echo
+	fi
 	echo
 	elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
 	# Make convenience symlinks
 	update_vim_symlinks
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.622.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.622.ebuild
@ -1,23 +1,23 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.52.ebuild,v 1.1 2013/10/15 23:15:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.622.ebuild,v 1.3 2015/03/31 17:37:10 ulm Exp $
 EAPI=5
 VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+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-single-r1
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1
 if [[ ${PV} == 9999* ]] ; then
 	inherit mercurial
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
 	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_ORG_PATCH}
-	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"
+		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"
 fi
 DESCRIPTION="Vim, an improved vi-style text editor"
@ -25,33 +25,43 @@ HOMEPAGE="http://www.vim.org/"
 SLOT="0"
 LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python ruby tcl vim-pager"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
 	luajit? ( lua )
 	python? (
 		|| ( $(python_gen_useflags '*') )
 		?? ( $(python_gen_useflags 'python2*') )
 		?? ( $(python_gen_useflags 'python3*') )
 	)
 "
-RDEPEND=">=app-admin/eselect-vi-1.1
+RDEPEND="
 	>=app-eselect/eselect-vi-1.1
 	>=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )
 	acl? ( kernel_linux? ( sys-apps/acl ) )
 	cscope? ( dev-util/cscope )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	lua? (
-		luajit? ( dev-lang/luajit )
+		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	!minimal? (
 		~app-editors/vim-core-${PV}
 		dev-util/ctags
 	)
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
+	racket? ( dev-scheme/racket )
-	tcl? ( dev-lang/tcl )
+	ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
-	X? ( x11-libs/libXt )"
+	selinux? ( sys-libs/libselinux )
 	tcl? ( dev-lang/tcl:0= )
 	X? ( x11-libs/libXt )
 "
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-vi-1.1
 	sys-devel/autoconf
-	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )
-	nls? ( sys-devel/gettext )"
+"
 S=${WORKDIR}/vim${VIM_VERSION/.}
@ -63,15 +73,19 @@ pkg_setup() {
 	# Gnome sandbox silliness. bug #114475.
 	mkdir -p "${T}"/home
 	export HOME="${T}"/home
 	use python && python-single-r1_pkg_setup
 }
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
 			# Apply any patches available from vim.org for this version
-			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
 		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
@ -79,9 +93,6 @@ src_prepare() {
 	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
 		|| die "mve.awk sed failed"
 	# Patch to build with ruby-1.8.0_pre5 and following
 	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
@ -122,8 +133,7 @@ src_prepare() {
 	# Try to avoid sandbox problems. Bug #114475.
 	if [[ -d "${S}"/src/po ]] ; then
-		sed -i -e \
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
 			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
 			"${S}"/src/po/Makefile
 	fi
@ -136,10 +146,12 @@ src_prepare() {
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
 	epatch_user
 }
 src_configure() {
-	local myconf
+	local myconf=()
 	# Fix bug 37354: Disallow -funroll-all-loops on amd64
 	# Bug 57859 suggests that we want to do this for all archs
@ -155,7 +167,7 @@ src_configure() {
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm -f src/auto/configure
 	emake -j1 -C src autoconf
@ -166,74 +178,87 @@ src_configure() {
 	done
 	if use minimal ; then
-		myconf="--with-features=tiny \
+		myconf=(
-			--disable-nls \
+			--with-features=tiny
-			--disable-multibyte \
+			--disable-nls
-			--disable-acl \
+			--disable-multibyte
-			--enable-gui=no \
+			--disable-acl
-			--without-x \
+			--enable-gui=no
-			--disable-darwin \
+			--without-x
-			--disable-luainterp \
+			--disable-darwin
-			--disable-perlinterp \
+			--disable-luainterp
-			--disable-pythoninterp \
+			--disable-perlinterp
-			--disable-rubyinterp \
+			--disable-pythoninterp
-			--disable-tclinterp \
+			--disable-mzschemeinterp
-			--disable-gpm"
+			--disable-rubyinterp
 			--disable-selinux
 			--disable-tclinterp
 			--disable-gpm
 		)
 	else
 		use debug && append-flags "-DDEBUG"
-		myconf="--with-features=huge --enable-multibyte"
+		myconf=(
-		myconf+=" $(use_enable acl)"
+			--with-features=huge
-		myconf+=" $(use_enable cscope)"
+			--enable-multibyte
-		myconf+=" $(use_enable gpm)"
+			$(use_enable acl)
-		myconf+=" $(use_enable nls)"
+			$(use_enable cscope)
-		myconf+=" $(use_enable perl perlinterp)"
+			$(use_enable gpm)
 			$(use_enable lua luainterp)
 			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
 			$(use_with luajit)
 			$(use_enable nls)
 			$(use_enable perl perlinterp)
 			$(use_enable racket mzschemeinterp)
 			$(use_enable ruby rubyinterp)
 			$(use_enable selinux)
 			$(use_enable tcl tclinterp)
 		)
 		if use python ; then
-			if [[ ${EPYTHON} == python3* ]] ; then
+			py_add_interp() {
-				myconf+=" --enable-python3interp"
+				local v
 				export vi_cv_path_python3="${PYTHON}"
 			else
 				myconf+=" --enable-pythoninterp"
 				export vi_cv_path_python="${PYTHON}"
 			fi
 		else
 			myconf+=" --disable-pythoninterp --disable-python3interp"
 		fi
-		myconf+=" $(use_enable lua luainterp)"
+				[[ ${EPYTHON} == python3* ]] && v=3
-		myconf+=" $(use_with luajit)"
+				myconf+=(
-		myconf+=" $(use_enable ruby rubyinterp)"
+					--enable-python${v}interp
-		myconf+=" $(use_enable tcl tclinterp)"
+					vi_cv_path_python${v}="${PYTHON}"
 				)
 			}
-		# tclinterp is broken; when you --enable-tclinterp flag, then
+			python_foreach_impl py_add_interp
-		# the following command never returns:
+		else
-		#   VIMINIT='let OS=system("uname -s")' vim
+			myconf+=(
-		# mzscheme support is currently broken. bug #91970
+				--disable-pythoninterp
-		#myconf+=" $(use_enable mzscheme mzschemeinterp)"
+				--disable-python3interp
 			)
 		fi
 		# --with-features=huge forces on cscope even if we --disable it. We need
 		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
 		if ! use cscope ; then
-			sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || \
+			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
 				die "couldn't disable cscope"
 		fi
 		# don't test USE=X here ... see bug #19115
 		# but need to provide a way to link against X ... see bug #20093
-		myconf+=" --enable-gui=no --disable-darwin $(use_with X x)"
+		myconf+=(
 			--enable-gui=no
 			--disable-darwin
 			$(use_with X x)
 		)
 	fi
 	# Let Portage do the stripping. Some people like that.
 	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
 	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
+	use prefix && myconf+=( --without-local-dir )
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
-		--disable-selinux \
+		"${myconf[@]}"
 		${myconf}
 }
 src_compile() {
@ -262,21 +287,19 @@ src_test() {
 	# Test 49 won't work inside a portage environment
 	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-	sed -i -e 's~test49.out~~g' Makefile
+	sed -i 's~test49.out~~g' Makefile
 	# We don't want to rebuild vim before running the tests
-	sed -i -e 's,: \$(VIMPROG),: ,' Makefile
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
 	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim nongui \
+	emake -j1 VIMPROG=../vim nongui
 		|| die "At least one test failed"
 }
 # Make convenience symlinks, hopefully without stepping on toes.  Some
 # of these links are "owned" by the vim ebuild when it is installed,
 # but they might be good for gvim as well (see bug 45828)
 update_vim_symlinks() {
 	has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
 	local f syms
 	syms="vimdiff rvim rview"
 	einfo "Calling eselect vi update..."
@ -326,6 +349,8 @@ src_install() {
 	fi
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
 	# keep in sync with 'complete ... -F' list
 	bashcomp_alias vim ex vi view rvim rview vimdiff
 	# We shouldn't be installing the ex or view man page symlinks, as they
 	# are managed by eselect-vi
@ -336,6 +361,7 @@ pkg_postinst() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		if use X ; then
 			echo
 			elog "The 'X' USE flag enables vim <-> X communication, like"
@ -353,10 +379,7 @@ pkg_postinst() {
 		echo
 		ewarn "Note that the English word lists are no longer installed by"
 		ewarn "default."
-	echo
+	fi
 	echo
 	elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
 	# Make convenience symlinks
 	update_vim_symlinks
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.670.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-7.4.670.ebuild
@ -0,0 +1,394 @@
 # 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.670.ebuild,v 1.2 2015/03/31 17:37:10 ulm Exp $
 EAPI=5
 VIM_VERSION="7.4"
 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
 if [[ ${PV} == 9999* ]] ; then
 	inherit mercurial
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 else
 	VIM_ORG_PATCH="vim-${PV}.patch.xz"
 	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
 		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"
 fi
 DESCRIPTION="Vim, an improved vi-style text editor"
 HOMEPAGE="http://www.vim.org/"
 SLOT="0"
 LICENSE="vim"
 IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
 REQUIRED_USE="
 	luajit? ( lua )
 	python? (
 		|| ( $(python_gen_useflags '*') )
 		?? ( $(python_gen_useflags 'python2*') )
 		?? ( $(python_gen_useflags 'python3*') )
 	)
 "
 RDEPEND="
 	>=app-eselect/eselect-vi-1.1
 	>=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )
 	acl? ( kernel_linux? ( sys-apps/acl ) )
 	cscope? ( dev-util/cscope )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	lua? (
 		luajit? ( dev-lang/luajit:2= )
 		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	!minimal? (
 		~app-editors/vim-core-${PV}
 		dev-util/ctags
 	)
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
 	selinux? ( sys-libs/libselinux )
 	tcl? ( dev-lang/tcl:0= )
 	X? ( x11-libs/libXt )
 "
 DEPEND="${RDEPEND}
 	sys-devel/autoconf
 	nls? ( sys-devel/gettext )
 "
 S=${WORKDIR}/vim${VIM_VERSION/.}
 pkg_setup() {
 	# people with broken alphabets run into trouble. bug 82186.
 	unset LANG LC_ALL
 	export LC_COLLATE="C"
 	# Gnome sandbox silliness. bug #114475.
 	mkdir -p "${T}"/home
 	export HOME="${T}"/home
 }
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
 		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
 			# Apply any patches available from vim.org for this version
 			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
 		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
 	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
 		|| die "mve.awk sed failed"
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
 	# This fixes bug 29398 (27 Sep 2003 agriffis)
 	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
 		"${S}"/runtime/doc/syntax.txt \
 		"${S}"/runtime/doc/tagsrch.txt \
 		"${S}"/runtime/doc/usr_29.txt \
 		"${S}"/runtime/menu.vim \
 		"${S}"/src/configure.in || die 'sed failed'
 	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
 	# this is NeXT, but it's actually just a file in dev-libs/9libs
 	# This fixes bug 43885 (20 Mar 2004 agriffis)
 	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
 	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
 	# correctly. To avoid some really entertaining error messages about stuff
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
 	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
 	# conditionally make the manpager.sh script
 	if use vim-pager ; then
 		cat <<-END > "${S}"/runtime/macros/manpager.sh
 			#!/bin/sh
 			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
 					vim \\
 						-c 'let no_plugin_maps = 1' \\
 						-c 'set nolist nomod ft=man' \\
 						-c 'let g:showmarks_enable=0' \\
 						-c 'runtime! macros/less.vim' -
 			END
 	fi
 	# Try to avoid sandbox problems. Bug #114475.
 	if [[ -d "${S}"/src/po ]] ; then
 		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
 			"${S}"/src/po/Makefile
 	fi
 	if version_is_at_least 7.3.122 ; then
 		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
 	fi
 	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
 	if version_is_at_least 7.3 ; then
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
 	epatch_user
 }
 src_configure() {
 	local myconf=()
 	# Fix bug 37354: Disallow -funroll-all-loops on amd64
 	# Bug 57859 suggests that we want to do this for all archs
 	filter-flags -funroll-all-loops
 	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
 	# everyone since previous flag filtering bugs have turned out to affect
 	# multiple archs...
 	replace-flags -O3 -O2
 	# Fix bug 18245: Prevent "make" from the following chain:
 	# (1) Notice configure.in is newer than auto/configure
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
 	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm -f src/auto/configure
 	emake -j1 -C src autoconf
 	# This should fix a sandbox violation (see bug 24447). The hvc
 	# things are for ppc64, see bug 86433.
 	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
 		[[ -e ${file} ]] && addwrite $file
 	done
 	if use minimal ; then
 		myconf=(
 			--with-features=tiny
 			--disable-nls
 			--disable-multibyte
 			--disable-acl
 			--enable-gui=no
 			--without-x
 			--disable-darwin
 			--disable-luainterp
 			--disable-perlinterp
 			--disable-pythoninterp
 			--disable-mzschemeinterp
 			--disable-rubyinterp
 			--disable-selinux
 			--disable-tclinterp
 			--disable-gpm
 		)
 	else
 		use debug && append-flags "-DDEBUG"
 		myconf=(
 			--with-features=huge
 			--enable-multibyte
 			$(use_enable acl)
 			$(use_enable cscope)
 			$(use_enable gpm)
 			$(use_enable lua luainterp)
 			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
 			$(use_with luajit)
 			$(use_enable nls)
 			$(use_enable perl perlinterp)
 			$(use_enable racket mzschemeinterp)
 			$(use_enable ruby rubyinterp)
 			$(use_enable selinux)
 			$(use_enable tcl tclinterp)
 		)
 		if use python ; then
 			py_add_interp() {
 				local v
 				[[ ${EPYTHON} == python3* ]] && v=3
 				myconf+=(
 					--enable-python${v}interp
 					vi_cv_path_python${v}="${PYTHON}"
 				)
 			}
 			python_foreach_impl py_add_interp
 		else
 			myconf+=(
 				--disable-pythoninterp
 				--disable-python3interp
 			)
 		fi
 		# --with-features=huge forces on cscope even if we --disable it. We need
 		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
 		if ! use cscope ; then
 			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
 				die "couldn't disable cscope"
 		fi
 		# don't test USE=X here ... see bug #19115
 		# but need to provide a way to link against X ... see bug #20093
 		myconf+=(
 			--enable-gui=no
 			--disable-darwin
 			$(use_with X x)
 		)
 	fi
 	# Let Portage do the stripping. Some people like that.
 	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
 	# Keep Gentoo Prefix env contained within the EPREFIX
 	use prefix && myconf+=( --without-local-dir )
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
 		"${myconf[@]}"
 }
 src_compile() {
 	# The following allows emake to be used
 	emake -j1 -C src auto/osdef.h objects
 	emake
 }
 src_test() {
 	echo
 	einfo "Starting vim tests. Several error messages will be shown"
 	einfo "while the tests run. This is normal behaviour and does not"
 	einfo "indicate a fault."
 	echo
 	ewarn "If the tests fail, your terminal may be left in a strange"
 	ewarn "state. Usually, running 'reset' will fix this."
 	echo
 	# Don't let vim talk to X
 	unset DISPLAY
 	# We've got to call make test from within testdir, since the Makefiles
 	# don't pass through our VIMPROG argument
 	cd "${S}"/src/testdir
 	# Test 49 won't work inside a portage environment
 	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
 	sed -i 's~test49.out~~g' Makefile
 	# We don't want to rebuild vim before running the tests
 	sed -i 's,: \$(VIMPROG),: ,' Makefile
 	# Don't try to do the additional GUI test
 	emake -j1 VIMPROG=../vim nongui
 }
 # Make convenience symlinks, hopefully without stepping on toes.  Some
 # of these links are "owned" by the vim ebuild when it is installed,
 # but they might be good for gvim as well (see bug 45828)
 update_vim_symlinks() {
 	local f syms
 	syms="vimdiff rvim rview"
 	einfo "Calling eselect vi update..."
 	# Call this with --if-unset to respect user's choice (bug 187449)
 	eselect vi update --if-unset
 	# Make or remove convenience symlink, vim -> gvim
 	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
 		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
 	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
 		rm "${EROOT}"/usr/bin/vim
 	fi
 	# Make or remove convenience symlinks to vim
 	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
 		for f in ${syms}; do
 			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
 		done
 	else
 		for f in ${syms}; do
 			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
 				rm -f "${EROOT}"/usr/bin/${f}
 			fi
 		done
 	fi
 	# This will still break if you merge then remove the vi package,
 	# but there's only so much you can do, eh?  Unfortunately we don't
 	# have triggers like are done in rpm-land.
 }
 src_install() {
 	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
 	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
 	#       managed by eselect-vi
 	dobin src/vim
 	dosym vim /usr/bin/vimdiff
 	dosym vim /usr/bin/rvim
 	dosym vim /usr/bin/rview
 	if use vim-pager ; then
 		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
 		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
 		insinto ${vimfiles}/macros
 		doins runtime/macros/manpager.sh
 		fperms a+x ${vimfiles}/macros/manpager.sh
 	fi
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
 	# keep in sync with 'complete ... -F' list
 	bashcomp_alias vim ex vi view rvim rview vimdiff
 	# We shouldn't be installing the ex or view man page symlinks, as they
 	# are managed by eselect-vi
 	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
 }
 pkg_postinst() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		if use X ; then
 			echo
 			elog "The 'X' USE flag enables vim <-> X communication, like"
 			elog "updating the xterm titlebar. It does not install a GUI."
 		fi
 		echo
 		elog "To install a GUI version of vim, use the app-editors/gvim"
 		elog "package."
 		echo
 		elog "Vim 7 includes an integrated spell checker. You need to install"
 		elog "word list files before you can use it. There are ebuilds for"
 		elog "some of these named app-vim/vim-spell-*. If your language of"
 		elog "choice is not included, please consult vim-spell.eclass for"
 		elog "instructions on how to make a package."
 		echo
 		ewarn "Note that the English word lists are no longer installed by"
 		ewarn "default."
 	fi
 	# Make convenience symlinks
 	update_vim_symlinks
 }
 pkg_postrm() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 	# Make convenience symlinks
 	update_vim_symlinks
 }
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild
@ -1,23 +1,23 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.7 2013/10/15 23:15:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.27 2015/03/31 17:37:10 ulm Exp $
 EAPI=5
 VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+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-single-r1
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1
 if [[ ${PV} == 9999* ]] ; then
 	inherit mercurial
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
+	VIM_ORG_PATCH="vim-${PV}.patch.xz"
 	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_ORG_PATCH}
-	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"
+		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"
 fi
 DESCRIPTION="Vim, an improved vi-style text editor"
@ -25,33 +25,43 @@ HOMEPAGE="http://www.vim.org/"
 SLOT="0"
 LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python ruby tcl vim-pager"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
 	luajit? ( lua )
 	python? (
 		|| ( $(python_gen_useflags '*') )
 		?? ( $(python_gen_useflags 'python2*') )
 		?? ( $(python_gen_useflags 'python3*') )
 	)
 "
-RDEPEND=">=app-admin/eselect-vi-1.1
+RDEPEND="
 	>=app-eselect/eselect-vi-1.1
 	>=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )
 	acl? ( kernel_linux? ( sys-apps/acl ) )
 	cscope? ( dev-util/cscope )
 	gpm? ( >=sys-libs/gpm-1.19.3 )
 	lua? (
-		luajit? ( dev-lang/luajit )
+		luajit? ( dev-lang/luajit:2= )
-		!luajit? ( dev-lang/lua )
+		!luajit? ( dev-lang/lua:0[deprecated] )
 	)
 	!minimal? (
 		~app-editors/vim-core-${PV}
 		dev-util/ctags
 	)
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
+	racket? ( dev-scheme/racket )
-	tcl? ( dev-lang/tcl )
+	ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) )
-	X? ( x11-libs/libXt )"
+	selinux? ( sys-libs/libselinux )
 	tcl? ( dev-lang/tcl:0= )
 	X? ( x11-libs/libXt )
 "
 DEPEND="${RDEPEND}
 	>=app-admin/eselect-vi-1.1
 	sys-devel/autoconf
-	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )
-	nls? ( sys-devel/gettext )"
+"
 S=${WORKDIR}/vim${VIM_VERSION/.}
@ -63,15 +73,19 @@ pkg_setup() {
 	# Gnome sandbox silliness. bug #114475.
 	mkdir -p "${T}"/home
 	export HOME="${T}"/home
 	use python && python-single-r1_pkg_setup
 }
 src_prepare() {
 	if [[ ${PV} != 9999* ]] ; then
-		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
+		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then
 			# Apply any patches available from vim.org for this version
-			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
+			epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz}
 		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
@ -79,9 +93,6 @@ src_prepare() {
 	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
 		|| die "mve.awk sed failed"
 	# Patch to build with ruby-1.8.0_pre5 and following
 	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
@ -122,8 +133,7 @@ src_prepare() {
 	# Try to avoid sandbox problems. Bug #114475.
 	if [[ -d "${S}"/src/po ]] ; then
-		sed -i -e \
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
 			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
 			"${S}"/src/po/Makefile
 	fi
@ -136,10 +146,12 @@ src_prepare() {
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
 	epatch_user
 }
 src_configure() {
-	local myconf
+	local myconf=()
 	# Fix bug 37354: Disallow -funroll-all-loops on amd64
 	# Bug 57859 suggests that we want to do this for all archs
@ -155,7 +167,7 @@ src_configure() {
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm -f src/auto/configure
 	emake -j1 -C src autoconf
@ -166,74 +178,87 @@ src_configure() {
 	done
 	if use minimal ; then
-		myconf="--with-features=tiny \
+		myconf=(
-			--disable-nls \
+			--with-features=tiny
-			--disable-multibyte \
+			--disable-nls
-			--disable-acl \
+			--disable-multibyte
-			--enable-gui=no \
+			--disable-acl
-			--without-x \
+			--enable-gui=no
-			--disable-darwin \
+			--without-x
-			--disable-luainterp \
+			--disable-darwin
-			--disable-perlinterp \
+			--disable-luainterp
-			--disable-pythoninterp \
+			--disable-perlinterp
-			--disable-rubyinterp \
+			--disable-pythoninterp
-			--disable-tclinterp \
+			--disable-mzschemeinterp
-			--disable-gpm"
+			--disable-rubyinterp
 			--disable-selinux
 			--disable-tclinterp
 			--disable-gpm
 		)
 	else
 		use debug && append-flags "-DDEBUG"
-		myconf="--with-features=huge --enable-multibyte"
+		myconf=(
-		myconf+=" $(use_enable acl)"
+			--with-features=huge
-		myconf+=" $(use_enable cscope)"
+			--enable-multibyte
-		myconf+=" $(use_enable gpm)"
+			$(use_enable acl)
-		myconf+=" $(use_enable nls)"
+			$(use_enable cscope)
-		myconf+=" $(use_enable perl perlinterp)"
+			$(use_enable gpm)
 			$(use_enable lua luainterp)
 			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
 			$(use_with luajit)
 			$(use_enable nls)
 			$(use_enable perl perlinterp)
 			$(use_enable racket mzschemeinterp)
 			$(use_enable ruby rubyinterp)
 			$(use_enable selinux)
 			$(use_enable tcl tclinterp)
 		)
 		if use python ; then
-			if [[ ${EPYTHON} == python3* ]] ; then
+			py_add_interp() {
-				myconf+=" --enable-python3interp"
+				local v
 				export vi_cv_path_python3="${PYTHON}"
 			else
 				myconf+=" --enable-pythoninterp"
 				export vi_cv_path_python="${PYTHON}"
 			fi
 		else
 			myconf+=" --disable-pythoninterp --disable-python3interp"
 		fi
-		myconf+=" $(use_enable lua luainterp)"
+				[[ ${EPYTHON} == python3* ]] && v=3
-		myconf+=" $(use_with luajit)"
+				myconf+=(
-		myconf+=" $(use_enable ruby rubyinterp)"
+					--enable-python${v}interp
-		myconf+=" $(use_enable tcl tclinterp)"
+					vi_cv_path_python${v}="${PYTHON}"
 				)
 			}
-		# tclinterp is broken; when you --enable-tclinterp flag, then
+			python_foreach_impl py_add_interp
-		# the following command never returns:
+		else
-		#   VIMINIT='let OS=system("uname -s")' vim
+			myconf+=(
-		# mzscheme support is currently broken. bug #91970
+				--disable-pythoninterp
-		#myconf+=" $(use_enable mzscheme mzschemeinterp)"
+				--disable-python3interp
 			)
 		fi
 		# --with-features=huge forces on cscope even if we --disable it. We need
 		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
 		if ! use cscope ; then
-			sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || \
+			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
 				die "couldn't disable cscope"
 		fi
 		# don't test USE=X here ... see bug #19115
 		# but need to provide a way to link against X ... see bug #20093
-		myconf+=" --enable-gui=no --disable-darwin $(use_with X x)"
+		myconf+=(
 			--enable-gui=no
 			--disable-darwin
 			$(use_with X x)
 		)
 	fi
 	# Let Portage do the stripping. Some people like that.
 	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
 	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
+	use prefix && myconf+=( --without-local-dir )
 	econf \
 		--with-modified-by=Gentoo-${PVR} \
-		--disable-selinux \
+		"${myconf[@]}"
 		${myconf}
 }
 src_compile() {
@ -262,21 +287,19 @@ src_test() {
 	# Test 49 won't work inside a portage environment
 	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-	sed -i -e 's~test49.out~~g' Makefile
+	sed -i 's~test49.out~~g' Makefile
 	# We don't want to rebuild vim before running the tests
-	sed -i -e 's,: \$(VIMPROG),: ,' Makefile
+	sed -i 's,: \$(VIMPROG),: ,' Makefile
 	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim nongui \
+	emake -j1 VIMPROG=../vim nongui
 		|| die "At least one test failed"
 }
 # Make convenience symlinks, hopefully without stepping on toes.  Some
 # of these links are "owned" by the vim ebuild when it is installed,
 # but they might be good for gvim as well (see bug 45828)
 update_vim_symlinks() {
 	has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
 	local f syms
 	syms="vimdiff rvim rview"
 	einfo "Calling eselect vi update..."
@ -326,6 +349,8 @@ src_install() {
 	fi
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
 	# keep in sync with 'complete ... -F' list
 	bashcomp_alias vim ex vi view rvim rview vimdiff
 	# We shouldn't be installing the ex or view man page symlinks, as they
 	# are managed by eselect-vi
@ -336,6 +361,7 @@ pkg_postinst() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		if use X ; then
 			echo
 			elog "The 'X' USE flag enables vim <-> X communication, like"
@ -353,10 +379,7 @@ pkg_postinst() {
 		echo
 		ewarn "Note that the English word lists are no longer installed by"
 		ewarn "default."
-	echo
+	fi
 	echo
 	elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
 	# Make convenience symlinks
 	update_vim_symlinks
--- a/sdk_container/src/third_party/portage-stable/eclass/vim.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/vim.eclass
@ -1,764 +0,0 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.220 2013/06/11 09:25:45 radhermit Exp $
 # Authors:
 # 	Jim Ramsay <lack@gentoo.org>
 # 	Ryan Phillips <rphillips@gentoo.org>
 # 	Seemant Kulleen <seemant@gentoo.org>
 # 	Aron Griffis <agriffis@gentoo.org>
 # 	Ciaran McCreesh <ciaranm@gentoo.org>
 #	Mike Kelly <pioto@gentoo.org>
 # This eclass handles vim, gvim and vim-core.
 # gvim's GUI preference order is as follows:
 # aqua                          CARBON (not tested)
 # -aqua gtk gnome               GNOME2
 # -aqua gtk -gnome              GTK2
 # -aqua -gtk  motif             MOTIF
 # -aqua -gtk -motif neXt        NEXTAW
 # -aqua -gtk -motif -neXt       ATHENA
 # Check for EAPI functions we need:
 case "${EAPI:-0}" in
 	0|1)
 		die "vim.eclass no longer supports EAPI 0 or 1"
 		;;
 	2|3)
 		;;
 	5)
 		HAS_PYTHON_R1=1
 		;;
 	*)
 		die "Unknown EAPI ${EAPI}"
 		;;
 esac
 if [[ ${PN} != "vim-core" ]] ; then
 	if [[ ${HAS_PYTHON_R1} ]]; then
 		PYTHON_REQ_USE=threads
 		inherit python-single-r1
 	else
 		# vim supports python-2 only
 		PYTHON_DEPEND="python? 2"
 		PYTHON_USE_WITH_OPT="python"
 		PYTHON_USE_WITH="threads"
 		inherit python
 	fi
 fi
 inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix
 if [[ ${PV} == 9999* ]] ; then
 	inherit mercurial
 	EHG_REPO_URI="https://vim.googlecode.com/hg/"
 	EHG_PROJECT="vim"
 fi
 HOMEPAGE="http://www.vim.org/"
 SLOT="0"
 LICENSE="vim"
 IUSE="nls acl"
 EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_configure \
 	src_install src_test pkg_postinst pkg_postrm
 DEPEND="${DEPEND}
 	>=app-admin/eselect-vi-1.1
 	sys-apps/gawk
 	>=sys-apps/sed-4
 	sys-devel/autoconf
 	>=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )"
 RDEPEND="${RDEPEND}
 	>=app-admin/eselect-vi-1.1
 	>=sys-libs/ncurses-5.2-r2
 	nls? ( virtual/libintl )"
 if [[ ${PN} == "vim-core" ]] ; then
 	IUSE="${IUSE} livecd"
 	PDEPEND="!livecd? ( app-vim/gentoo-syntax )"
 else
 	IUSE="${IUSE} cscope debug gpm perl python ruby"
 	if [[ ${HAS_PYTHON_R1} ]]; then
 		DEPEND="${DEPEND}
 			python? ( ${PYTHON_DEPS} )"
 		RDEPEND="${RDEPEND}
 			python? ( ${PYTHON_DEPS} )"
 		REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 	fi
 	DEPEND="${DEPEND}
 		cscope?  ( dev-util/cscope )
 		gpm?     ( >=sys-libs/gpm-1.19.3 )
 		perl?    ( dev-lang/perl )
 		acl?     ( kernel_linux? ( sys-apps/acl ) )
 		ruby?    ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )"
 	RDEPEND="${RDEPEND}
 		cscope?  ( dev-util/cscope )
 		gpm?     ( >=sys-libs/gpm-1.19.3 )
 		perl?    ( dev-lang/perl )
 		acl?     ( kernel_linux? ( sys-apps/acl ) )
 		ruby?    ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
 		!<app-vim/align-30-r1
 		!<app-vim/vimbuddy-0.9.1-r1
 		!<app-vim/autoalign-11
 		!<app-vim/supertab-0.41"
 	# mzscheme support is currently broken. bug #91970
 	# IUSE="${IUSE} mzscheme"
 	# DEPEND="${DEPEND}
 	# 	mzscheme? ( dev-scheme/mzscheme )"
 	# RDEPEND="${RDEPEND}
 	# 	mzscheme? ( dev-scheme/mzscheme )"
 	if [[ ${PN} == vim ]] ; then
 		IUSE="${IUSE} X minimal vim-pager"
 		DEPEND="${DEPEND}
 			X? ( x11-libs/libXt x11-libs/libX11
 				x11-libs/libSM x11-proto/xproto )
 			!minimal? ( dev-util/ctags )"
 		RDEPEND="${RDEPEND}
 			X? ( x11-libs/libXt )
 			!minimal? ( ~app-editors/vim-core-${PV}
 				dev-util/ctags )
 			!<app-editors/nvi-1.81.5-r4"
 	elif [[ ${PN} == gvim ]] ; then
 		IUSE="${IUSE} aqua gnome gtk motif neXt netbeans"
 		DEPEND="${DEPEND}
 			dev-util/ctags
 			!aqua? (
 				gtk? (
 					virtual/pkgconfig
 				)
 			)"
 		RDEPEND="${RDEPEND}
 			~app-editors/vim-core-${PV}
 			dev-util/ctags
 			x11-libs/libXext
 			!aqua? (
 				gtk? (
 					>=x11-libs/gtk+-2.6:2
 					x11-libs/libXft
 					gnome? ( >=gnome-base/libgnomeui-2.6 )
 				)
 				!gtk? (
 					motif? (
 						>=x11-libs/motif-2.3:0
 					)
 					!motif? (
 						neXt? (
 							x11-libs/neXtaw
 						)
 						!neXt? ( x11-libs/libXaw )
 					)
 				)
 			)"
 	fi
 fi
 S=${WORKDIR}/vim${VIM_VERSION/.}
 apply_vim_patches() {
 	local p
 	cd "${S}" || die "cd ${S} failed"
 	# Scan the patches, applying them only to files that either
 	# already exist or that will be created by the patch
 	#
 	# Changed awk to gawk in the below; BSD's awk chokes on it
 	# --spb, 2004/12/18
 	#
 	# Allow either gzipped or uncompressed patches in the tarball.
 	# --lack 2009-05-18
 	#
 	# Also removed date-seeking regexp to find first and second lines of the
 	# patch since as of 7.2.167 the date format has changed.  It is less work
 	# (while marginally less correct) to just look for lines that start with
 	# '***' and do not end with '****' (and "---" / "----" for the second line).
 	# --lack 2009-05-18
 	einfo "Filtering vim patches ..."
 	p=${WORKDIR}/${VIM_ORG_PATCHES%.tar*}.patch
 	ls "${WORKDIR}"/vimpatches | sort | \
 	while read f; do
 		local fpath="${WORKDIR}"/vimpatches/${f}
 		case $f in
 			*.gz)
 				gzip -dc "${fpath}"
 				;;
 			*)
 				cat "${fpath}"
 				;;
 		esac
 	done | gawk '
 		/^Subject: [Pp]atch/ {
 			if (patchnum) {printf "\n" >"/dev/stderr"}
 			patchnum = $3
 			printf "%s:", patchnum >"/dev/stderr"
 		}
 		$1=="***" && $(NF)!="****" {
 			# First line of a patch; suppress printing
 			firstlines = $0
 			next
 		}
 		$1=="---" && $(NF)!="----" {
 			# Second line of a patch; try to open the file to see
 			# if it exists.
 			thisfile = $2
 			if (!seen[thisfile] && (getline tryme < thisfile) == -1) {
 				# Check if it will be created
 				firstlines = firstlines "\n" $0
 				getline
 				firstlines = firstlines "\n" $0
 				getline
 				if ($0 != "*** 0 ****") {
 					# Non-existent and not created, stop printing
 					printing = 0
 					printf " (%s)", thisfile >"/dev/stderr"
 					next
 				}
 			}
 			# Close the file to avoid leakage, bug 205037
 			close(thisfile)
 			# Print the previous lines and start printing
 			print firstlines
 			printing = 1
 			printf " %s", thisfile >"/dev/stderr"
 			# Remember that we have seen this file
 			seen[thisfile] = 1
 		}
 		printing { print }
 		END { if (patchnum) {printf "\n" >"/dev/stderr"} }
 		' > ${p} || die
 	# For reasons yet unknown, epatch fails to apply this cleanly
 	ebegin "Applying filtered vim patches"
 	TMPDIR=${T} patch -f -s -p0 < ${p}
 	eend 0
 }
 vim_pkg_setup() {
 	# people with broken alphabets run into trouble. bug 82186.
 	unset LANG LC_ALL
 	export LC_COLLATE="C"
 	# Gnome sandbox silliness. bug #114475.
 	mkdir -p "${T}/home"
 	export HOME="${T}/home"
 	if [[ ${PN} != "vim-core" ]] && use python; then
 		if [[ ${HAS_PYTHON_R1} ]]; then
 			python-single-r1_pkg_setup
 		else
 			# vim supports python-2 only
 			python_set_active_version 2
 			# python.eclass only defines python_pkg_setup for EAPIs that support
 			# USE dependencies
 			python_pkg_setup
 		fi
 	fi
 }
 vim_src_prepare() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
 	if [[ ${PV} != 9999* ]] ; then
 		# Apply any patches available from vim.org for this version
 		if [[ $VIM_ORG_PATCHES == *.patch.bz2 ]]; then
 			einfo "Applying monolithic patch ${VIM_ORG_PATCHES}"
 			epatch "${WORKDIR}/${VIM_ORG_PATCHES%.bz2}"
 		else
 			apply_vim_patches
 		fi
 	fi
 	# Another set of patches borrowed from src rpm to fix syntax errors etc.
 	cd "${S}" || die "cd ${S} failed"
 	if [[ -d "${WORKDIR}"/gentoo/patches-all/ ]]; then
 		EPATCH_SUFFIX="gz" EPATCH_FORCE="yes" \
 			epatch "${WORKDIR}"/gentoo/patches-all/
 	elif [[ ${PN} == "vim-core" ]] && [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then
 		# Patches for vim-core only (runtime/*)
 		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
 			epatch "${WORKDIR}"/gentoo/patches-core/
 	fi
 	# Fixup a script to use awk instead of nawk
 	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
 		|| die "mve.awk sed failed"
 	# Patch to build with ruby-1.8.0_pre5 and following
 	sed -i 's/defout/stdout/g' "${S}"/src/if_ruby.c
 	# Read vimrc and gvimrc from /etc/vim
 	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
 	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
 	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
 	# Hopefully this pattern won't break for a while at least.
 	# This fixes bug 29398 (27 Sep 2003 agriffis)
 	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
 		"${S}"/runtime/doc/syntax.txt \
 		"${S}"/runtime/doc/tagsrch.txt \
 		"${S}"/runtime/doc/usr_29.txt \
 		"${S}"/runtime/menu.vim \
 		"${S}"/src/configure.in || die 'sed failed'
 	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
 	# this is NeXT, but it's actually just a file in dev-libs/9libs
 	# This fixes bug 43885 (20 Mar 2004 agriffis)
 	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
 	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
 	# correctly. To avoid some really entertaining error messages about stuff
 	# which isn't even in the source file being invalid, we'll do some trickery
 	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
 	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
 	# conditionally make the manpager.sh script
 	if [[ ${PN} == vim ]] && use vim-pager ; then
 		cat <<END > "${S}"/runtime/macros/manpager.sh
 #!/bin/sh
 sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
 		vim \\
 			-c 'let no_plugin_maps = 1' \\
 			-c 'set nolist nomod ft=man' \\
 			-c 'let g:showmarks_enable=0' \\
 			-c 'runtime! macros/less.vim' -
 END
 	fi
 	# Try to avoid sandbox problems. Bug #114475.
 	if [[ -d "${S}"/src/po ]] ; then
 		sed -i -e \
 			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
 			"${S}"/src/po/Makefile
 	fi
 	if version_is_at_least 7.3.122; then
 		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
 	fi
 	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
 	if version_is_at_least 7.3; then
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
 }
 vim_src_configure() {
 	local myconf
 	# Fix bug 37354: Disallow -funroll-all-loops on amd64
 	# Bug 57859 suggests that we want to do this for all archs
 	filter-flags -funroll-all-loops
 	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
 	# everyone since previous flag filtering bugs have turned out to affect
 	# multiple archs...
 	replace-flags -O3 -O2
 	# Fix bug 18245: Prevent "make" from the following chain:
 	# (1) Notice configure.in is newer than auto/configure
 	# (2) Rebuild auto/configure
 	# (3) Notice auto/configure is newer than auto/config.mk
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
 	ebegin "Creating configure script"
 	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
 	rm -f src/auto/configure
 	# autoconf-2.13 needed for this package -- bug 35319
 	# except it seems we actually need 2.5 now -- bug 53777
 	WANT_AUTOCONF=2.5 \
 		emake -j1 -C src autoconf || die "make autoconf failed"
 	eend $?
 	# This should fix a sandbox violation (see bug 24447). The hvc
 	# things are for ppc64, see bug 86433.
 	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
 		[[ -e ${file} ]] && addwrite $file
 	done
 	if [[ ${PN} == "vim-core" ]] ||
 			( [[ ${PN} == vim ]] && use minimal ); then
 		myconf="--with-features=tiny \
 			--enable-gui=no \
 			--without-x \
 			--disable-darwin \
 			--disable-perlinterp \
 			--disable-pythoninterp \
 			--disable-rubyinterp \
 			--disable-gpm"
 	else
 		use debug && append-flags "-DDEBUG"
 		myconf="--with-features=huge \
 			--enable-multibyte"
 		myconf="${myconf} $(use_enable cscope)"
 		myconf="${myconf} $(use_enable gpm)"
 		myconf="${myconf} $(use_enable perl perlinterp)"
 		if [[ ${HAS_PYTHON_R1} ]]; then
 			if use python; then
 				if [[ ${EPYTHON} == python3* ]]; then
 					myconf="${myconf} --enable-python3interp"
 					export vi_cv_path_python3="${PYTHON}"
 				else
 					myconf="${myconf} --enable-pythoninterp"
 					export vi_cv_path_python="${PYTHON}"
 				fi
 			else
 				myconf="${myconf} --disable-pythoninterp --disable-python3interp"
 			fi
 		else
 			myconf="${myconf} $(use_enable python pythoninterp)"
 		fi
 		myconf="${myconf} $(use_enable ruby rubyinterp)"
 		# tclinterp is broken; when you --enable-tclinterp flag, then
 		# the following command never returns:
 		#   VIMINIT='let OS=system("uname -s")' vim
 		# mzscheme support is currently broken. bug #91970
 		#myconf="${myconf} $(use_enable mzscheme mzschemeinterp)"
 		if [[ ${PN} == gvim ]] ; then
 			myconf="${myconf} $(use_enable netbeans)"
 		fi
 		# --with-features=huge forces on cscope even if we --disable it. We need
 		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
 		if ! use cscope ; then
 			sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || \
 				die "couldn't disable cscope"
 		fi
 		if [[ ${PN} == vim ]] ; then
 			# don't test USE=X here ... see bug #19115
 			# but need to provide a way to link against X ... see bug #20093
 			myconf="${myconf} --enable-gui=no --disable-darwin $(use_with X x)"
 		elif [[ ${PN} == gvim ]] ; then
 			myconf="${myconf} --with-vim-name=gvim --with-x"
 			echo ; echo
 			if use aqua ; then
 				einfo "Building gvim with the Carbon GUI"
 				myconf="${myconf} --enable-darwin --enable-gui=carbon"
 			elif use gtk ; then
 				myconf="${myconf} --enable-gtk2-check"
 				if use gnome ; then
 					einfo "Building gvim with the Gnome 2 GUI"
 					myconf="${myconf} --enable-gui=gnome2"
 				else
 					einfo "Building gvim with the gtk+-2 GUI"
 					myconf="${myconf} --enable-gui=gtk2"
 				fi
 			elif use motif ; then
 				einfo "Building gvim with the MOTIF GUI"
 				myconf="${myconf} --enable-gui=motif"
 			elif use neXt ; then
 				einfo "Building gvim with the neXtaw GUI"
 				myconf="${myconf} --enable-gui=nextaw"
 			else
 				einfo "Building gvim with the Athena GUI"
 				myconf="${myconf} --enable-gui=athena"
 			fi
 			echo ; echo
 		else
 			die "vim.eclass doesn't understand PN=${PN}"
 		fi
 	fi
 	if [[ ${PN} == vim ]] && use minimal ; then
 		myconf="${myconf} --disable-nls --disable-multibyte --disable-acl"
 	else
 		myconf="${myconf} $(use_enable nls) $(use_enable acl)"
 	fi
 	myconf="${myconf} --disable-selinux"
 	# Let Portage do the stripping. Some people like that.
 	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
 	# Keep Gentoo Prefix env contained within the EPREFIX
 	use prefix && myconf="${myconf} --without-local-dir"
 	if [[ ${PN} == "*vim" ]] ; then
 		if [[ ${CHOST} == *-interix* ]]; then
 			# avoid finding of this function, to avoid having to patch either
 			# configure or the source, which would be much more hackish.
 			# after all vim does it right, only interix is badly broken (again)
 			export ac_cv_func_sigaction=no
 		fi
 	fi
 	myconf="${myconf} --with-modified-by=Gentoo-${PVR}"
 	econf ${myconf} || die "vim configure failed"
 }
 vim_src_compile() {
 	# The following allows emake to be used
 	emake -j1 -C src auto/osdef.h objects || die "make failed"
 	if [[ ${PN} == "vim-core" ]] ; then
 		emake tools || die "emake tools failed"
 		rm -f src/vim
 	else
 		if ! emake ; then
 			eerror "If the above messages seem to be talking about perl"
 			eerror "and undefined references, please try re-emerging both"
 			eerror "perl and libperl with the same USE flags. For more"
 			eerror "information, see:"
 			eerror "    https://bugs.gentoo.org/show_bug.cgi?id=18129"
 			die "emake failed"
 		fi
 	fi
 }
 vim_src_install() {
 	has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
 	has "${EAPI:-0}" 0 1 2 && use !prefix && ED="${D}"
 	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
 	if [[ ${PN} == "vim-core" ]] ; then
 		dodir /usr/{bin,share/{man/man1,vim}}
 		cd src || die "cd src failed"
 		make \
 			installruntime \
 			installmanlinks \
 			installmacros \
 			installtutor \
 			installtutorbin \
 			installtools \
 			install-languages \
 			install-icons \
 			DESTDIR=${D} \
 			BINDIR="${EPREFIX}"/usr/bin \
 			MANDIR="${EPREFIX}"/usr/share/man \
 			DATADIR="${EPREFIX}"/usr/share \
 			|| die "install failed"
 		keepdir ${vimfiles}/keymap
 		# default vimrc is installed by vim-core since it applies to
 		# both vim and gvim
 		insinto /etc/vim/
 		newins "${FILESDIR}"/vimrc${VIMRC_FILE_SUFFIX} vimrc
 		eprefixify "${ED}"/etc/vim/vimrc
 		if use livecd ; then
 			# To save space, install only a subset of the files if we're on a
 			# livecd. bug 65144.
 			einfo "Removing some files for a smaller livecd install ..."
 			eshopts_push -s extglob
 			rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
 			rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
 			rm "${ED}"/usr/bin/vimtutor
 			local keep_colors="default"
 			ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
 			local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
 			# tinkering with the next line might make bad things happen ...
 			keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
 			ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
 			eshopts_pop
 		fi
 		# These files might have slight security issues, so we won't
 		# install them. See bug #77841. We don't mind if these don't
 		# exist.
 		rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
 	elif [[ ${PN} == gvim ]] ; then
 		dobin src/gvim
 		dosym gvim /usr/bin/gvimdiff
 		dosym gvim /usr/bin/evim
 		dosym gvim /usr/bin/eview
 		dosym gvim /usr/bin/gview
 		dosym gvim /usr/bin/rgvim
 		dosym gvim /usr/bin/rgview
 		dodir /usr/share/man/man1
 		echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
 		echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
 		echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
 		insinto /etc/vim
 		newins "${FILESDIR}"/gvimrc${GVIMRC_FILE_SUFFIX} gvimrc
 		eprefixify "${ED}"/etc/vim/gvimrc
 		insinto /usr/share/applications
 		newins "${FILESDIR}"/gvim.desktop${GVIM_DESKTOP_SUFFIX} gvim.desktop
 		insinto /usr/share/pixmaps
 		doins "${FILESDIR}"/gvim.xpm
 	else # app-editor/vim
 		# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
 		#       managed by eselect-vi
 		dobin src/vim
 		dosym vim /usr/bin/vimdiff
 		dosym vim /usr/bin/rvim
 		dosym vim /usr/bin/rview
 		if use vim-pager ; then
 			dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
 			dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
 			insinto ${vimfiles}/macros
 			doins runtime/macros/manpager.sh
 			fperms a+x ${vimfiles}/macros/manpager.sh
 		fi
 	fi
 	# bash completion script, bug #79018.
 	if [[ ${PN} == "vim-core" ]] ; then
 		newbashcomp "${FILESDIR}"/xxd-completion xxd
 	else
 		newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
 	fi
 	# We shouldn't be installing the ex or view man page symlinks, as they
 	# are managed by eselect-vi
 	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
 }
 # Make convenience symlinks, hopefully without stepping on toes.  Some
 # of these links are "owned" by the vim ebuild when it is installed,
 # but they might be good for gvim as well (see bug 45828)
 update_vim_symlinks() {
 	has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
 	local f syms
 	syms="vimdiff rvim rview"
 	einfo "Calling eselect vi update..."
 	# Call this with --if-unset to respect user's choice (bug 187449)
 	eselect vi update --if-unset
 	# Make or remove convenience symlink, vim -> gvim
 	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
 		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
 	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
 		rm "${EROOT}"/usr/bin/vim
 	fi
 	# Make or remove convenience symlinks to vim
 	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
 		for f in ${syms}; do
 			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
 		done
 	else
 		for f in ${syms}; do
 			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
 				rm -f "${EROOT}"/usr/bin/${f}
 			fi
 		done
 	fi
 	# This will still break if you merge then remove the vi package,
 	# but there's only so much you can do, eh?  Unfortunately we don't
 	# have triggers like are done in rpm-land.
 }
 vim_pkg_postinst() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 	# Update fdo mime stuff, bug #78394
 	if [[ ${PN} == gvim ]] ; then
 		fdo-mime_mime_database_update
 	fi
 	if [[ ${PN} == vim ]] ; then
 		if use X; then
 			echo
 			elog "The 'X' USE flag enables vim <-> X communication, like"
 			elog "updating the xterm titlebar. It does not install a GUI."
 		fi
 		echo
 		elog "To install a GUI version of vim, use the app-editors/gvim"
 		elog "package."
 	fi
 	echo
 	elog "Vim 7 includes an integrated spell checker. You need to install"
 	elog "word list files before you can use it. There are ebuilds for"
 	elog "some of these named app-vim/vim-spell-*. If your language of"
 	elog "choice is not included, please consult vim-spell.eclass for"
 	elog "instructions on how to make a package."
 	echo
 	ewarn "Note that the English word lists are no longer installed by"
 	ewarn "default."
 	echo
 	if [[ ${PN} != "vim-core" ]] ; then
 		echo
 		elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
 	fi
 	# Make convenience symlinks
 	if [[ ${PN} != "vim-core" ]] ; then
 		# But only for vim/gvim, bug #252724
 		update_vim_symlinks
 	fi
 }
 vim_pkg_postrm() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 	# Make convenience symlinks
 	if [[ ${PN} != "vim-core" ]] ; then
 		# But only for vim/gvim, bug #252724
 		update_vim_symlinks
 	fi
 	# Update fdo mime stuff, bug #78394
 	if [[ ${PN} == gvim ]] ; then
 		fdo-mime_mime_database_update
 	fi
 }
 vim_src_test() {
 	if [[ ${PN} == "vim-core" ]] ; then
 		einfo "No testing needs to be done for vim-core"
 		return
 	fi
 	einfo " "
 	einfo "Starting vim tests. Several error messages will be shown "
 	einfo "whilst the tests run. This is normal behaviour and does not "
 	einfo "indicate a fault."
 	einfo " "
 	ewarn "If the tests fail, your terminal may be left in a strange "
 	ewarn "state. Usually, running 'reset' will fix this."
 	ewarn " "
 	echo
 	# Don't let vim talk to X
 	unset DISPLAY
 	if [[ ${PN} == gvim ]] ; then
 		# Make gvim not try to connect to X. See :help gui-x11-start
 		# in vim for how this evil trickery works.
 		ln -s "${S}"/src/gvim "${S}"/src/testvim
 		testprog="../testvim"
 	else
 		testprog="../vim"
 	fi
 	# We've got to call make test from within testdir, since the Makefiles
 	# don't pass through our VIMPROG argument
 	cd "${S}"/src/testdir
 	# Test 49 won't work inside a portage environment
 	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
 	sed -i -e 's~test49.out~~g' Makefile
 	# We don't want to rebuild vim before running the tests
 	sed -i -e 's,: \$(VIMPROG),: ,' Makefile
 	# Don't try to do the additional GUI test
 	make VIMPROG=${testprog} nongui \
 		|| die "At least one test failed"
 }
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.3.1214
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.3.1214
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=app-admin/eselect-vi-1.1 sys-apps/gawk >=sys-apps/sed-4 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-proto/xproto ) !minimal? ( dev-util/ctags )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=python_targets_python3_3 python_targets_python2_7 python_single_target_python3_3 python_single_target_python2_7 nls acl cscope debug gpm perl python ruby X minimal vim-pager
 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 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.1214 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.3.1214.patch.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim	0672fce36e8067fa486443678d40f43b	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=c7a984079e0fcd2d1b59de40a34d4d03
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.3.762
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.3.762
@ -1,13 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 sys-apps/gawk >=sys-apps/sed-4 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) X? ( x11-libs/libXt x11-libs/libX11 x11-libs/libSM x11-proto/xproto ) !minimal? ( dev-util/ctags )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=3
 HOMEPAGE=http://www.vim.org/
 IUSE=nls acl cscope debug gpm perl python ruby X minimal vim-pager
 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 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] ) >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) perl? ( dev-lang/perl ) acl? ( kernel_linux? ( sys-apps/acl ) ) ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) !<app-vim/align-30-r1 !<app-vim/vimbuddy-0.9.1-r1 !<app-vim/autoalign-11 !<app-vim/supertab-0.41 X? ( x11-libs/libXt ) !minimal? ( ~app-editors/vim-core-7.3.762 dev-util/ctags ) !<app-editors/nvi-1.81.5-r4
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.762.patch.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim	0672fce36e8067fa486443678d40f43b	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=7cb2685f5951fd24e42b7b303ac2a1e5
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.22
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.22
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) !minimal? ( ~app-editors/vim-core-7.4.22 dev-util/ctags ) perl? ( dev-lang/perl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) X? ( x11-libs/libXt ) >=app-admin/eselect-vi-1.1 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python ruby vim-pager python_targets_python3_3 python_targets_python2_7 python_single_target_python3_3 python_single_target_python2_7
 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
 LICENSE=vim
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) !minimal? ( ~app-editors/vim-core-7.4.22 dev-util/ctags ) perl? ( dev-lang/perl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) X? ( x11-libs/libXt )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.22.patch.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=66d83a02021895133314ffb7a7c7eb29
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.273
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.273
@ -0,0 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.273 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
 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
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.273 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) luajit? ( lua )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.273.patch.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=31b7f4c508e961be6d175720f2dc9945
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.41
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.41
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) !minimal? ( ~app-editors/vim-core-7.4.41 dev-util/ctags ) perl? ( dev-lang/perl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) X? ( x11-libs/libXt ) >=app-admin/eselect-vi-1.1 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python ruby vim-pager python_targets_python3_3 python_targets_python2_7 python_single_target_python3_3 python_single_target_python2_7
 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
 LICENSE=vim
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) !minimal? ( ~app-editors/vim-core-7.4.41 dev-util/ctags ) perl? ( dev-lang/perl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) X? ( x11-libs/libXt )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.41.patch.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=b7ae3327703576a0f6e96b6959085dd8
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.52
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.52
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) !minimal? ( ~app-editors/vim-core-7.4.52 dev-util/ctags ) perl? ( dev-lang/perl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt ) >=app-admin/eselect-vi-1.1 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python ruby tcl vim-pager python_targets_python3_3 python_targets_python2_7 python_single_target_python3_3 python_single_target_python2_7
 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
 LICENSE=vim
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) !minimal? ( ~app-editors/vim-core-7.4.52 dev-util/ctags ) perl? ( dev-lang/perl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.52.patch.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=7a38d56d5ab4952ff25bcb58c3ca28c8
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.591
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.591
@ -0,0 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.591 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
 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
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.591 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) luajit? ( lua )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.591.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=c512b6bc8e0a443030b281bc247c5b5f
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.622
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.622
@ -0,0 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.622 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 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
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.622 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_3 python_targets_python3_4 ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.622.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	b63f5ef61876823ab0bd05d867697d75	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=eb366cc296664385548ad178bc790dc9
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.670
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-7.4.670
@ -0,0 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.670 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext )
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 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
 LICENSE=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-7.4.670 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_3 python_targets_python3_4 ) )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.670.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	b63f5ef61876823ab0bd05d867697d75	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=3b13802e474e05f55b3abaad1d05b1ea
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-9999
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-9999
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt ) >=app-admin/eselect-vi-1.1 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) dev-vcs/mercurial
+DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) sys-devel/autoconf nls? ( sys-devel/gettext ) dev-vcs/mercurial
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=5
 HOMEPAGE=http://www.vim.org/
-IUSE=X acl cscope debug gpm lua luajit minimal nls perl python ruby tcl vim-pager python_targets_python3_3 python_targets_python2_7 python_single_target_python3_3 python_single_target_python2_7
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 LICENSE=vim
-RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit ) !luajit? ( dev-lang/lua ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) dev-lang/python-exec:=[python_targets_python3_3(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),python_single_target_python3_3(+)?,python_single_target_python2_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt )
+RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 dev-util/ctags ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.1 dev-lang/ruby:2.0 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=luajit? ( lua ) python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) ?? ( python_targets_python2_7 ) ?? ( python_targets_python3_3 python_targets_python3_4 ) )
 SLOT=0
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	mercurial	2fbda5894dda6392b71334ee9a92de0b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	cc5b6367244dc2070b496eb9a92d5b87	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	mercurial	2fbda5894dda6392b71334ee9a92de0b	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	b63f5ef61876823ab0bd05d867697d75	python-utils-r1	d5328656d500f65898a5f51634722f61	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=a248d960e9575f575c73a65a21b1b97f
+_md5_=d3a3022bf39ae8c9c8274c946b192778
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.3.1214
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.3.1214
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=app-admin/eselect-vi-1.1 sys-apps/gawk >=sys-apps/sed-4 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 DESCRIPTION=vim and gvim shared files
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=nls acl livecd
 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
 LICENSE=vim
 PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-core-7.3-gentoo-patches-r3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.3.1214.patch.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim	0672fce36e8067fa486443678d40f43b	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=ec8483f6eee92ccfb464596f8ea792c3
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.3.762
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.3.762
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=app-admin/eselect-vi-1.1 sys-apps/gawk >=sys-apps/sed-4 sys-devel/autoconf >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 DESCRIPTION=vim and gvim shared files
 EAPI=3
 HOMEPAGE=http://www.vim.org/
 IUSE=nls acl livecd
 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
 LICENSE=vim
 PDEPEND=!livecd? ( app-vim/gentoo-syntax )
 RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-core-7.3-gentoo-patches-r2.tar.bz2 http://dev.gentoo.org/~lack/vim/vim-patches-7.3.762.patch.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim	0672fce36e8067fa486443678d40f43b	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=1b44f0b9820b4113c85e92efbb59ddab
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.273
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.273
@ -4,10 +4,10 @@ DESCRIPTION=vim and gvim shared files
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=nls acl minimal
-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
+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
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
-SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-core-7.3-gentoo-patches-r3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.52.patch.bz2
+SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-core-7.3-gentoo-patches-r4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.273.patch.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=5c2147c5df7ae692622e3e404e1096fe
+_md5_=5db477a682a703904767ee7b29fed837
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.591
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.591
@ -4,10 +4,10 @@ DESCRIPTION=vim and gvim shared files
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=nls acl minimal
-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
+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
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
-SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-core-7.3-gentoo-patches-r3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.22.patch.bz2
+SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.591.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=932ddf6650961524e46ae3ad94842fb1
+_md5_=d51719b52b64c9eb6b1966c1a496ae25
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.622
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.622
@ -4,10 +4,10 @@ DESCRIPTION=vim and gvim shared files
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=nls acl minimal
-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
+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
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
-SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-core-7.3-gentoo-patches-r3.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.41.patch.bz2
+SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.622.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=343cc76740e3ffbd3f85b8ea88722770
+_md5_=85ae4a07afa8f8e8960eda3cab8e753f
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.670
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.670
@ -0,0 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=sys-devel/autoconf
 DESCRIPTION=vim and gvim shared files
 EAPI=5
 HOMEPAGE=http://www.vim.org/
 IUSE=nls acl minimal
 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
 LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.670.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
 _md5_=6e997bbe3263446c3f9f6954ad1f124e
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-9999
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-9999
@ -8,4 +8,4 @@ LICENSE=vim
 PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 SLOT=0
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	6faef4c127028ccbba3a11400d24ae34	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	mercurial	2fbda5894dda6392b71334ee9a92de0b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=b13e2b1a2ed3a03613d831515304916b
+_md5_=dfe95df91fa05a234aa13919fa239d9e