Merge pull request #537 from dm0-/git

Upgrade Git
2025-08-18 10:27:00 +02:00 · 2017-04-11 16:34:34 -07:00 · 2017-04-11 16:34:34 -07:00 · c92f0362c9
commit c92f0362c9
parent 6938a8f344 895f814a7a
52 changed files with 494 additions and 5773 deletions
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest
@ -1,65 +1,38 @@
 AUX 50git-gentoo.el 472 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 WHIRLPOOL 887682f79182f6728af3c0fd2ee0e81319d49761a987559684be5e4acae4af579a5b8d1197ddba31452cec179de3c8f5784cc85ad61f78b400e42c204c93f642
 AUX git-1.8.5-mw-vendor.patch 1160 SHA256 e613f8874beec8d11644ad8d12c43cccb6585f96e99485d7d8ead6618321e8c0 SHA512 6513104f28eff36c18840f90e56fb21e8e04055e4e9a304ef15e5d7e1c13c8b45c4be0380b7781e776ce3b8ee9f7371ed2200e01174cc257125a613aef43ac9b WHIRLPOOL 6a5dcb28dc40590cf4e4b1369b0d770b40f1060bf933366f252edafbb9781f39d7f46dc218c16d429f507c7d5a9479bafce2df7309178071bcb782095809ed69
 AUX git-2.10.0-optional-cvs.patch 14373 SHA256 ca1fdbca8488ed700073075a3bd52bd20d239afb93e8a913e0d1f4f08da230cf SHA512 be1d75789424d49dfcdf87c9e8016e86aeab945bf68c9d82cf77ed1f032622b14194b3f472d21a450748d3c6cf108bbe089e7289e360f30078941a2fdcc8a001 WHIRLPOOL 005b2012486639e5d51930644482ea8cd24ca4d5ec98e04e1a657e3762235c0e971499f1e4d5852887037e38b96290b3e7d46b8364090ff74a7fb327d9f562b3
 AUX git-2.12.0-optional-cvs.patch 14388 SHA256 56ab35325847b4ef5f04ac0f5e1d86889190804abffe8a42009a701162ab6c64 SHA512 fb44d17628e0c6d39053c8221296a8d81ccc84cf8cb49a0be13ecffcf79c69902f01c43c3b0ce45d2cb2c880116e2fb6d78d95e9c8d2fe5f19ff37bc4a6f8761 WHIRLPOOL 1ce6db0fc2feed91e517adba11183620fe7bc7d1ef468e164fa725e43811553fd841776e67606c92d64145d91f2cdcad5fd3104741733b5c60c90209fb15d52a
 AUX git-2.2.0-svn-fe-linking.patch 418 SHA256 45b89e10bec13fd7b29f7b530bf5ef57d3263581930ff338bf2105b3a96e6df0 SHA512 ac312e7da4c548073d4dfa5d9bb6823ed48ea70a30d7993da190cfc4cc4b17124e15326748d79e59ca0772675619b29221a57c5af45b7b6c7196dae218772ecd WHIRLPOOL d31618b8012b2b9eca5ae5c4317c893a21697b182aa877e236a34eefc17869b0c659c35617d70e7cd316d430de5d093fe18bce947996f8c6aade7cd8c60a4c38
 AUX git-2.2.2-optional-cvs.patch 14282 SHA256 94b2bcbb2438f15c95521b758ac189429515dbb2631c496c1c5f121a5e6d622e SHA512 1d897a6e097b9c8cf92b499286f9ba77ac6cf507dbd734e1e1f7da719ecf294045dda531ab5bc35cfbe653ac6747dd4a4e3f2d22d68fd6a0f73e940256c6b474 WHIRLPOOL 63ea264a398aeb1f38d15f9b3da9d931c3ea122536e36224a46d6fd0adbb7b7355d3b2dfa3801f548de5995bd875c13e3c6080e77480a6afba770d7fab45f5b1
 AUX git-2.5.1-freebsd-10.x-no-iconv.patch 568 SHA256 f5f96e35b9d3138a0806aa2298d00ee0138c453eebd3f325f58ff3d07dabe361 SHA512 9f7334b2c5b69c5a6a94e198a522b176470b0ae9d428694b9a404e4bcf33d269f43c8d2d9b5834e36f9a875d12a7b21f59caaaffad6d05cb6267ab2967e64567 WHIRLPOOL d40617ebd5b7e3ff7b7fd2948178741f427bf505233a3f2d0b3ffa0408218ea39aa5e04c94e2810c4db153ef4a3244ad0af48f8f2b785885f1f2ce81758728eb
 AUX git-2.7.0-mediawiki-500pages.patch 1317 SHA256 2a3ca7e73ea0b1575c4646a8cf9b2b7bcac74f5fa9c7c5e6b8fc9d320ee2cc89 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be WHIRLPOOL e890b6c529e007dc1fbb8f6188b9c23f16856d65a38ce702657eea2f065a4ff52b6ee8bd284726582db765222dfefb31da71c14217b3c15968050e093bc14a6f
 AUX git-2.7.0-mediawiki-namespaces.patch 3188 SHA256 7205e94a95c9e9027b2a8472854e0d76dfb3053b8e7f139836d90b3555c62b89 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f WHIRLPOOL 674de2ded34bf2d1d05c3e606b881e00a92ae7958a45e481d51d8766b0429d0054149017a5f21c024f466b62fffb6dddce64c7569caacfc0aa34c3c2b20d3610
 AUX git-2.7.0-mediawiki-subpages.patch 2091 SHA256 322aeee855c163c0e0cd5048b36bf464052fbbbd98fc23257b6e5c525d9057c5 SHA512 e294c0d4588499961632bcc6ea20474984c4bcc7a804ff3cd9d12584cecad3c36f5772c21cf7a884b517370eb7d87542f7bdc3b2c5482c18dbc623abe5e7c73e WHIRLPOOL 3731669811ec1cce64890afb5e0ee3add808d1da8f32a5061ed6d15c7a54aaf0bd4a350f35c4d78565132fe736bf02119fe51ef641fedf02f546e2b3fcc23655
-AUX git-2.8.4-optional-cvs.patch 14421 SHA256 0cc7e4536466dfa912275265fbfec106907e0dd9133814baf39a8c83c050c4bd SHA512 7e4aba65db20bccf77862d4a5f2e128efba449c2a53c7144e90e198e10e4e1566f143eb5cb18f8dec1cb1e08b665c38b23d36d3de5a7ec237fd45d968cba9cd3 WHIRLPOOL f7b3666843a2da2039b48d359b41f037167a08c0e2ddaad74c42cfcbe34677102c8050d6b8c9c5b59cc4ff56b867121780345447487f147d5e3766bd7aa51a2d
+AUX git-daemon-r1.initd 368 SHA256 c39eff8e0d0156f035b987521444476875852519ddfe6b36ea5c205d93a7f323 SHA512 6fcdefec671ca9b0191e32902663a3400b76cdec82500bdcf65dec1bdecb78a40678c80c7f77b0789a2877284db3400cdf52289c2221f8daa7e3fa7620ec1bfb WHIRLPOOL b90de85619b0da130f463cdbaa774c6489ae6e5eb0618cf9c1b9297cf100f6dac0c7642054842dbf628c5bdd5c57aa694b01280949e73f95704e41345c8e2de0
 AUX git-daemon-r1.initd 375 SHA256 efa30f5db5b837ed9febd09af29f3740a9d479d098d5c3f8e4dcf334e01f77a3 SHA512 5a962ef717bb761fc113991c6f23264ffa6c7c5d50f261efe04cc2c429be2fcf249e48c56c1587c429472146a780753f9d570e5031d3dbec119eea48d0829244 WHIRLPOOL c2b83f41fde646757d7149ff4daa27ef1aa7a1ef44be8ef180632b184221be10ccd8ca7093d8b8a8142fd4c1b752ac660c180b22a496cb3c2a31ca16d1482356
 AUX git-daemon.confd 710 SHA256 4703ba2372c661fb674a29fea7f64983f8b1b3136d971663509249655bca6e21 SHA512 fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec WHIRLPOOL 1ce085e6f8580824f96517ae8d49f0a22124cb8d6cfa740dc041e0800bfe9541fa6d2a6ddb5dc23f96186ddfe4a539f4a72bb87deded2d7af37569957b52b4e5
 AUX git-daemon.socket 116 SHA256 66a064b67e441306bf765d3d3115ac55bafa2098400af134f852d4aecf8608d7 SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701 WHIRLPOOL 1098e46b6d2be3c8d758a087408aed91e0c01625542dfc90fbff80ed8b40d2a54ea4ab45b4d003ef0b0b8ed1411e1146a58076b68096389412a61fe2d09214dd
 AUX git-daemon.xinetd 260 SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c WHIRLPOOL 155bfca2c071d5368de09412d1d937cefd3b5cd28a991b99845551738440b92791c33a67ef41be711dbf06fc4faf4a299cbaf1f410b119fe5deb5a4cd741803d
 AUX git-daemon_at-r1.service 340 SHA256 980b2b2234fc672065286244cd4e690c92865d39a02001936801cb013b7d2dce SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9 WHIRLPOOL fd89d61e15bf499404b0a17a2e47257962c671cab09a3af53cb378758cf7a5f979026831a8da2270ea54fa8897e132def17307d03729ef2e30dfe7950c59b1b3
 AUX git-daemon_at.service 395 SHA256 c427e37d3e859c13f9441b20c7cb6aba7bca048cb70809ee1253726e733fac7d SHA512 4931954564ae7d2e21e49c8f251bae7c6be8a420f75e68e23214c85993dceb81b719e5fee11366b82b28ef5fa27a9ae2b2faa5c79c16d367c6d50fb03bbd0cff WHIRLPOOL a18f8fe6755c85e8d332d989637105d7842e8fc107a263dd0252e34e30dca21aaff593041bca3f0a728b995f19310d3cab8c43e2a7524ee9e612cca03c7ffccf
 DIST git-2.10.1.tar.xz 4102452 SHA256 a9c32df9061cfc2c194ecaa0357ba273c1f24a0dbf0d856b03dcedafcd0a4dc6 SHA512 976c62b530405388f77b01abb9dd40929831e0fdb83574c5c56ea309af462805659a20685221cf011db67635cebfe550853d1ba3764118bb53df41cf480f216a WHIRLPOOL e4c077c09ffdbe960450f48cf089836f12fe64e3b919a5e744a8644511d958f08f77f5066c189a9616e649fb20d05104dcd3fd0b345f3eff6c3f860945231bf6
 DIST git-2.10.2.tar.xz 4106108 SHA256 94802903dd707d85ca3b9a2be35e936a54ce86375f52c6a789efe7ce7e238671 SHA512 0ab09de481dbb31c3304382afaa5d3fc9f861115c9954c65b11a8a1c34b939118c7ed3ff60ac329145888596388e3e4d2b2fb677fe109d33a57206d531b5ee6a WHIRLPOOL 808404fa13f908d149028f64aaf5b73400448fff6393dabfaa874d750065e86ff5dae4903724cbca4e59fb74b3ff30b8b8f0a0f1435a0a90c18267c7a0550de6
-DIST git-2.11.0.rc2.tar.xz 4166928 SHA256 50f7ff3cd809ae1053e28a24ec0fad1a055bc1ef4d61136cf07063d43d02f83a SHA512 db410e63777e691860a5286a7c4ee837481c5035fa5cd7835da969d487741f1aef0be3edb747b8cff0493a8d8851d2010aa1a6dcfad397fdd59e42b5bc14b871 WHIRLPOOL 97a772fe47cc9c26ed774b5de54fec460d53c417e04fde9fc33a0c5f0f00b1160566332dcc57a2e65bab8f98ded15533f0ae9b6f6b56d2d7ca3181b2a73e2d57
+DIST git-2.11.1.tar.xz 4208132 SHA256 c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415 SHA512 c9d4196ad9c4f656b5a25fe688c06248bfce4fadac38e9bc835e5e9063ab95e3d4b3db4174acea0b3b64c5455adc93d39870f2b6009d2dd6aa0edb5a5f5bda40 WHIRLPOOL c91d7d096348cacd5a691d12406acb98d7fd703ac06e4d4fc31d85eead29c87860a96d43df06c1e3610837b4eb34adccb5b7b259531e064d495347fd2b14914e
-DIST git-2.4.11.tar.xz 3695028 SHA256 ebca2cf93b7200d6d7b9982e3e9857f0b433a05e51338a600c799e97919118e3 SHA512 34c60fa67e336a4c807a5f49e26083442acc52781b0adbd3f9d96b9594c0688686b30ca3a152621047489d59beb65ad99089a2f02cc589d6e3b36a79db1388fe WHIRLPOOL 75e6b3090560e7aef4fcb382413a7432ecb63880a4139466a64dd06d4777441afd34c208a59dba9a01144f0c2f3a3763a267672f9f7155867b462b4c0bf09cba
+DIST git-2.12.1.tar.xz 4271828 SHA256 db11674364b764e101966d829a2e271c9b9d2a8bd4d8ecb4221a1dcdc9a3ada2 SHA512 4f7203782f018e74c7ff273bb4290887524d67f34e794b26ef8f2d4cb98e57d6c95e29e2da7dd92a626228aad3d02befed9a0b5c9f97f43fe1ba52dad6ff5adb WHIRLPOOL be2d67d925c05bb50b610b4e5eed24b317e95400d0ed3d0c362116da2a2e5c768b7973d66e57cab6cd1e96da00a4f6e526d0d71dcc1b03e7c7195da7ae53c58e
-DIST git-2.5.5.tar.xz 3747448 SHA256 82976a05dd85d44405ec9758040dd190507494fa2af322bd2c97163024ce1e82 SHA512 edf223df92298a3d25865140b4a2c2194840b21f96c13e07ac35940d6afa759f766e4d36ad2e2428ba913c4949b4f76283475a6b7aa1cc774523c793cb5794f1 WHIRLPOOL 3ab15f8a0bc54d3865537bc70c9a0d6e3d8f30b9ba8c68c2dadbd77575f892f55e0e010b9ac89af03ca228f034abbccac53a619865c1e8044f61dedef8713501
+DIST git-2.12.2.tar.xz 4273748 SHA256 d21a9e23506e618d561fb25a8a7bd6134f927b86147930103487117a7a678c4a SHA512 0e980ea6932b43c87892c0628d23bce62dc8fa8be3510e6e8bbd14605526e3b13c8a32ea9fbe8a74c286c4fe0e1fa34e85922edf743a9405a31d5657804b4b8d WHIRLPOOL 45b60d67aa930f1e298ef9b02d95b8cfe7caa806716ba3bbfdb3a0b7736dc16631e1888d50844d5dba8ffe4c7a4216006edd32f1ddda0ed0f770472befa6bb8c
 DIST git-2.6.6.tar.xz 3822260 SHA256 8d53410d60f9c36b0f34c125076634d068c8d812f4143fa10b7130cd7acf7ec2 SHA512 5c77f83f34296f85d1b1f1bf00a59664bced9db7ad222606471d8400772441775b82fdbfae637aa11006164c4fc9912b8218aa2f6f7812112048902ecf5f0000 WHIRLPOOL ffc6d10b166b3d0ff1e51fe44a6809877b2d4a9679fc519b7648897621ea02616e330ae46693a2f306286b40c0b41589b20bc93e240b87d535ac5b9b84b28738
 DIST git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch 28198 SHA256 b6bf7d67b9cc4d34550a10933af63b665b136b869dbbe23ad3ece0d463f027f9 SHA512 3fd64b0d6b53d5b08b791195e6edc162db682fc8a1bafc04aab7a7a4e61e2db4b3b84d9f769e0d7756da2739bdd900e30a233c228706c39817e42e309c36684c WHIRLPOOL 7e1d9337d46222ea4ae2164429a6a220adb0f763bdde6722c0f2adf79789e092f5cfb74b932597b8d3971af4fc27dede1fea51b9cb72b44ec8e30bd78bdaaa8d
 DIST git-2.7.3.tar.xz 3909636 SHA256 89c467912d4740da2b40288f956251f0a1e276e28eecd28a6d776067103629b6 SHA512 f7acbf52d12f39d323bd90a82c7135aa2aacf2661f7087c71b41dbfbec688342e0a2fc061fc0f216848a538a0dbc4fce68e24ea2a26e747f5eb92f763fa5bc72 WHIRLPOOL 5cc261749f91c2e0b0509d2fac1bc7426b3ddcc37e859d4f524838e1dd471071ad430886751933bae57aafc20bdcf3f9a43f4c018cc9c89610134a5203b22447
 DIST git-2.7.4.tar.xz 3909636 SHA256 dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7 WHIRLPOOL 74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3
 DIST git-2.8.4.tar.xz 3982836 SHA256 120e9a32a1858871dea34165622ec7a63f27887b93093c8d72a18bcf89fe1657 SHA512 92c3b4437d1160cc23612b4df62646b80a1245d4ed482c3543ba19511f754a34d0185d5dd5d16f2a42bc3097bebc47ece0670c45a1c53ca38cbfbff7d43de87b WHIRLPOOL 8be86b1cba51ef549d56014c090dd5844019c2c5ccf15865dce86ed7f28f5628621450d784f23ba03f79282bc87e5a8ee0fad161a157785cf6c5716f8aa1e767
 DIST git-2.9.3.tar.xz 4025288 SHA256 9f1473350c1792310b51af03a9cb5cce841f68202f835b20d46312a30232fa63 SHA512 7152d075b705c92c813e977558b1a6d8d1c9e6ac01b41ee052bcd40c056f08c6fdb030ef0995822c6d22ce44b739935d89026aeae35f8b93fb569773c4b005bb WHIRLPOOL 0117dad19c4a74dcc7a7963dd2ffa60f5a1e10890e4f233b1c92cce87c07e3da270a65464ed152fc20ffbea34f074342a9153f7a328cae2d850b763b3a196c3e
 DIST git-htmldocs-2.10.1.tar.xz 1067144 SHA256 40f9ce980f91c0391438e5d04a1bb11b128c6b6bf272eac44d6fca80f2dacfcb SHA512 530c0b76263cfc4f4147fb6b8b485494f1c1bafd5e92bd5c5e16de914ab5f13eb0c358f4b36aba8471d70ffb087925598ea39116c254564c86f8c10061c3dd90 WHIRLPOOL 7d10f8e46419e38f31bdd9eef4a9aa5f8773b7f50394ba7ea8fb03fd5a224401a8abd781d2f4b41b6768331fb68177059d773ba326d624d376049dfb211036dc
 DIST git-htmldocs-2.10.2.tar.xz 1068436 SHA256 dd43111c3518a92a7fe64ac5cd32a5d4d77d49c67f7d89dce3e8293bc3d6b491 SHA512 8ef57218d7eef285ac427414d92bd5e8eba5c85c2a2a9ec0e423705ee2cb6f26dd33ad780d1b4237e7534dbe5cc3b4d8eea5780d0acc49066d78fc1893df2525 WHIRLPOOL 160fe3446d959d0f2315c9b2be182925619a4d89343602038e92283abdb393805eb5252799c502b83641d9e23a157332033baaa1ef2f1d9401cbbf372d8e86d7
-DIST git-htmldocs-2.11.0.rc2.tar.xz 1080176 SHA256 1d30b9d66c8b2766f1aeeca1fdd5f785a8fa282b0bb3c3fa96624372169e627e SHA512 516f6db0577d98a0d5a391981cd24989d0258860a9095ddded448546e4276b3987265ad5757352146c77ab3d721b0e7af8788fd300c3f139185945946c27ed31 WHIRLPOOL cfeb1946e1bd821ae0770ae4b2807925ef5ba37a7dc83dcbfcff0bf9ffae64ba4e57597aca8242fe3845664ca98f2324355948579565ba856b3a381232b9359c
+DIST git-htmldocs-2.11.1.tar.xz 1083264 SHA256 1a5f1e4a5eadad89b0783efa08bb1f7e3802d4a4d0a135bf5f61fd672ea3846e SHA512 dee37cfa0870f7289c66c3c58bb86d01324bfd30f4d4a05dedebef98ddb38339c7937bb2caee0e1d35ef579de414e5f280d5fd9f48fb427f497fe2f7d62f7d2a WHIRLPOOL 0ec4856405dbbc89547ab6d7236a787516fb7b8a8d2a3ff190b310c6b83cccfd080a5e9bac0523c99b34849b14a0eb96ffc16348643f65b38ebcdc3c8d8cd17e
-DIST git-htmldocs-2.4.11.tar.xz 997132 SHA256 2764af41b319f4d11b29832de4bd05392f2887d9a1d3c56c864fb081920eac97 SHA512 d5d2abae9cc303fe8ebeb72ae7078d44db94610d549ca03afffcbbef8b611efda662677423d9ff97a0c7a2384bbd4c3468b01a2ecd7b68f4fdc89e62ad688eb4 WHIRLPOOL 66cd4fc754be7c103ca58a030d4799ba988792419a426e85a39805172e6329ec617b3561696dc74be36801cca0b17a26102a194a1a58d6c7b9ee1ab17752c4a6
+DIST git-htmldocs-2.12.1.tar.xz 1091792 SHA256 10598f2f2693e066b58e8d269c3d682595a99340f29e8e7a66dda5e226fd181e SHA512 76c830360692cff09b36da2ac81572cd660a84f06f3b12360022a268bbd88c48c0f4d29b6b097b6b7459548012d419f53418dfd0cbebc0c7b23db78dc135d208 WHIRLPOOL 967bb04ea942cc94206403aad4e98ea092bfc215a70f435ea0cc3b78cea9c9c178f5b509976f861c1b7f2ef69414e376e98b82b45e73fc136861412494324134
-DIST git-htmldocs-2.5.5.tar.xz 1010216 SHA256 15de2f234cf419496399f7ad396709544d62537488a8e5200e6e34b0f1a685e7 SHA512 265ddf3835352f85eb2e2ee983eb8aaf37bc7b151968866bdb8b9bb6782cdb72dbd1fefe5d7f694a6825954d49bcf4c799e8bcb4e3b25e3f228f6f97f041fd9b WHIRLPOOL 90da44c0bdb6f9ff428d1673289e612936ed5f26110cd13d155c8cbef8433b13bd8b15cea88f967224a699e4c3a6ac41d70b67be1b25c4d35989879626eb10ad
+DIST git-htmldocs-2.12.2.tar.xz 1092716 SHA256 6f656085c2fdca94df1cc3eb8624c38099f920318c428e34ef0333ecf7f4cd59 SHA512 225aa58becc5d45a8f39333a68b4078147f3d8e31b1653eea181b83f5650c07b10c917596c6ca62b22e812932145fcde6932fa116a9731fda3c263e66f9a560f WHIRLPOOL 562a3f9ebd39563f92420274a02464cd1a4dfdcba7d01906d8e03f1f853d272e1edcf29969a76662e83fb7f11da502e0617ef7a30c961c23b881f889d63766d3
 DIST git-htmldocs-2.6.6.tar.xz 1021856 SHA256 897fb0bc7e2eb67a4b582c963f337fda3a6ad2b23bca55e27f23f7d15bad7c5d SHA512 85dcd8514e1ba2cb591512a0003aedf25eafbf185ba1eed01f8adfd9eb467d29b17108e6b087183004004ab17301316d403cd6762619ac2a030a565ea5c776b3 WHIRLPOOL 3cd964f1d0164db98e97e0097813a620911adadd9c50837e23a5ca79eb0f2d988aa68317b5b79fa7b052900564657c36d050e75841a1018d5ff12e1299c01dc6
 DIST git-htmldocs-2.7.3.tar.xz 1031848 SHA256 f71f5e8e1a6103e83ea794f367bc419a1d14ba0f79ebacdc81b3b9430714adea SHA512 50de5d9d3c0f6d874a6a4bc3b247a1795b1bcf154a276b546f88c3b5f5fb2eb27212d207a4bb50c04cba36d8537853afd25816addfb87c9a50e18528d93586fe WHIRLPOOL 057d9bebfe51c29a0a7f689baa9873cb6a54feb1d2869c541396902b160379c9220c5de79a4cb59c6e804e5c7557c0fd141b89621b97d3b495dc6e0a77c67a9f
 DIST git-htmldocs-2.7.4.tar.xz 1032428 SHA256 3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad SHA512 f05b7b8a4dd4abe23f7e51982e9c33026aa31610ac8640028aeae6b310b70b764aee9a81fa702ed0712ccf1b7ad897e06163eb5c5246c14f6cce7c5f4e462682 WHIRLPOOL 87fc486d182a4b72fd906105fefcc53b722c4ae6832b290cd6f759ac1eca7ebfbbe7c0e72c1d7b5ef3581d19d7576f1d0387d6e5b0a33d960d57f59ee61a7869
 DIST git-htmldocs-2.8.4.tar.xz 1042260 SHA256 78135be591e3a68d1030a76e343d59622e5e40f6990667f4385a01d9dafe9bbd SHA512 5da40db4421f94a969b83bfa0ea6e5ccf3fce8c2085ea2271a2eb3e1b4fc496c36ae8790207cd1814ff747b7633bb27fd53bb9c012f866ea1e7f1cc8065379dd WHIRLPOOL 4f80041ad4ef8b178a6b91313680433a7e07b0ecb15354304436d70880063b2f9cdd875fcd95684a817272d05a57485e1863e9e06c3788eddf0e5f031279ea9a
 DIST git-htmldocs-2.9.3.tar.xz 1055980 SHA256 abfa0e160c062a36956beaa5e8bf4d6e2db93f235c892f94681bd6f1feb71865 SHA512 4ce1c00767d485ca4ebec9ea5a3d001d4395eb44c2c82caec36b18dd1df26cbbd5d458d9c2b83b54d572d830eb0bccf2916f28863a96384cd3d6fcb741f1b97f WHIRLPOOL b3c16dd25da7309c4c8302008eda147e113e025081dfa447c6de629ae68fe5369e391c402fe3cdbfba2187040559609082edae5469238af68a1e17bd805acddf
 DIST git-manpages-2.10.1.tar.xz 395560 SHA256 89ff7aae275252d6b01cac6479e10e1be2e0208181ff14decf200606b5223611 SHA512 648c8f1705137459728d24610888bbcadd31bcd082984e9eddc045011852b1d696204f2d69b0d441989e44e78d6b73c240164f0f0e3d8fb451e30376094ef845 WHIRLPOOL 8fdea82f3c79206f5c10544641b623cabf340780c4ed29c8d60f74ecf17e30f31108bd5d1aed0e66556b071a640748a6904df166a7a61934d2649311d7e68679
 DIST git-manpages-2.10.2.tar.xz 395556 SHA256 83b0a317f6039ad95ef6af6a182cf659c2d053eed5d8f70b06710eb787f8aa6f SHA512 0dc5df8441601865511983b85762102396cbf7c704fd831eb6666ef7b7639252b971f6b4080b8a57226a86124edcdd77acf24374da22047bd315769a09109bef WHIRLPOOL e1d6b9cb4479b584c16a25a4f3b0528d96d483307e768efea3d7bd8156d74e1c59b61a641dfe5671f4cb01a02f10322262d133cb76f85194ac97ee74c6195d0e
-DIST git-manpages-2.11.0.rc2.tar.xz 399964 SHA256 e18482708fbf318afa71453da54841a289a6719b4d132d30ba8fe5344af6dd34 SHA512 e778b48672ffa423031c002c318ca8c05d7e998d11ea3aac6e1a9411c1cf82bdea80afba6996de534601050892db18cc17dde1552b6406e408c31bdfccbe793b WHIRLPOOL e98a0c64bd86a62606bce3564c33db37d2334dfe4af381ce1fd2d55dfbe715f06eed472a467307129789d7300f9d00edc86ae9557d29445da0d33c7fecff7e4a
+DIST git-manpages-2.11.1.tar.xz 400812 SHA256 69486ed339ee0591001ae83d43c888aa26351b9680b6ceb59e06b593051bca31 SHA512 ffa197ed163031f14882f85124399a7de3b1cadee089cb3d85a6b936215b23243102fd99fdf877f0a8b9d660711e994022cce8893ae27c0295a12dceb41c7f6b WHIRLPOOL 072416db28149c4531f05183ad515bc030611d68c1e7975dcf3f173aeedfb96607262ed120fcf8bea74a1c95b18ec98580cc2ae5e825b8f359e9b24021de7218
-DIST git-manpages-2.4.11.tar.xz 373956 SHA256 0a1fff7650e635339f92985a47198f5f6664eda1c233c3cf48e92f22c3735db2 SHA512 78226baf1c8be28c456a84b06f403af9b918cd3e46218917cce18b3b9ce494600bf00014b818ca0dff9f675aca8b17cd9f7893c7063e218d719a9567e81d9040 WHIRLPOOL f8883ca7d327c378937f62287cbb515b5271cb8aeda18d32135f1c7ea71c9f39282fe55b191476f046de4815a994e4f6f98696d9353f0bfcca7994101398786c
+DIST git-manpages-2.12.1.tar.xz 402644 SHA256 fbf5c34dde4385b04a0266444cda6834a97e6a589fc0a510c220da87f3d2a0ce SHA512 d06ad96aa368d2dadf9aeafaa50cefcf8015dcfb2aa0f356c5d70233470aee6aa1e831427e4a05ec8b1646ec8e1b9940d5f70cc331caecbda67e4811c79e1e94 WHIRLPOOL af2600e4157569c4a103a93811d6c7b320063f0d946620849ca55a2ce6f85447add6d065cee234afe9143f8612c3d593c7547a311795e2977054848af2136126
-DIST git-manpages-2.5.5.tar.xz 378304 SHA256 41b66002436add0781618764c3f0c8222bac7d8a636f1d7e2994480b22369930 SHA512 bebcc04fa54080316d01f1bd1ba7b91a1712e6c6a6f95306d9f079cf5858cf0fb2ccea24c606153e9adb99e956c5dbae5a5c7a7a0ed8c643efdf5a5db599cda1 WHIRLPOOL e72873d3f1a404a311e643d89cf65996d884e794e468417272cdda494ef621f0ebf875faa17433e443fcece54608c59a3c094372101bf4342fadcf8395dabce8
+DIST git-manpages-2.12.2.tar.xz 402804 SHA256 7ed1da04e6b0f7fb54a3c7546c6a30fe999b5c8ffcf5e3418521e7550b7f9558 SHA512 98991bc14248f95fe837d1fb9f3e451b48825fa2b1cef94cc016dbf796f5e4293c295a7bf1c35244d835d0d66b7008855c475dd3aa7fcabd5be1e382a4ff0c91 WHIRLPOOL 33d216bfdce99b0083abdcc175286fdfb189e729c38a8df1589757555bba2b7ac33e5cf9a3f927fc44d14caec590e4d6c9872dec0e4c7b3f5675fcbe07312895
-DIST git-manpages-2.6.6.tar.xz 381588 SHA256 0f64c1db015e3c74e56eef646a9fdd456cf043cae54714f404ad9b35ddb537a0 SHA512 bd8573f58bd988f78978041b88643e6d0af99ae0df4be6ec80db7de6e042970a23d9a153e84ddb8ffc538724b1482ff6dac7594462e28073067f54d040fdddfd WHIRLPOOL 3e8af6df1b96e3211c5799ace846dab331f30c1133c1d093e344b4576d8f588631e29187909b600112a9f7b42a0de63f56cec953e0d162cc49c2b6efeef0db53
+EBUILD git-2.10.2.ebuild 19143 SHA256 ecec482855261e2be14c60c915caa63dffda37104fb2c8bd68ff0d263cb2100f SHA512 409982e7a8c6b5b81a5e6262f526f29ee01f4b030cb36bfb044574015f73bbc6c0e90c927097b71f2aaf6969b00f50a48c106a04012430706517864d8c72ecbe WHIRLPOOL 8b1ec6809c8732064d07070dd781da26c06037ce044d5feb070a7734b685051c478f5c9b46cecadab92fdf1e0437a2b96e201a9c6b38d9d792875631a804ad1b
-DIST git-manpages-2.7.3.tar.xz 384544 SHA256 9f088427c61a9e0a840007c7f50fc6f7caba36ac8c403460c49210983090496d SHA512 883441df049bfaf0f22cf9d17041125dc9c8f0e7d94efa7a4188a68c2242d1b4c3d34fd3bd3ecdd2af905ee2f8fb5fefd0ce6328dd76c665f7ec20e3b9c87d1b WHIRLPOOL 7ee013444665366ecb8f3df507a3c5af8a9f48d3185783a94db827b192c32ac6998157eb42bcbfe397f96d452451b2416c32e2dffbabc71062422e7c5e25c184
+EBUILD git-2.11.1.ebuild 19212 SHA256 49d5a79683e0debebc6d8080e9f4a4fa71464bca6998b29437e7e509dcfd811a SHA512 bc2b809766a3e02cc5a23d0cc52cf3d497c5e9ae8fd903708c1addaac94405489d877b2a30adde5dd4bcd16eccce8a67d2371a342d29a344dba5f13f6adbcbe9 WHIRLPOOL d762ac7f7944c805dea0f47e414403ab63510da21206bc4e07391e74329e42df3086865723c65485608b85f4ef5e4f81a692cdb0ac8900dac883c0d0b27dc764
-DIST git-manpages-2.7.4.tar.xz 384460 SHA256 d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25 SHA512 1af6f0d9fc3945a5a215092caabd0963f3eaa35c5f3b0270861b625bf7bd88e4fdea9b3e50ce1b10c79a12ee2b06b203fab4aa9d566560535c1decf7b2d987cd WHIRLPOOL 38306b6e198336dd3c75a9fd032b636e0e43a3b75eba2746d2d42c3752cf7405b1f8572199748509974d68bfc77c74fbea52626884f9b509d8b593cefce4aad5
+EBUILD git-2.12.1.ebuild 18955 SHA256 26d5c2ea29e4c58df6865d3272e9af60648dba184625b0e10addb0298d6c04ae SHA512 de5e61bd25ef6ca10de8540c28d6aaeb7aebd04aa1d2b803a4fb6377894205e8de073c6abb70ac9d2dfbe096ede13ebe65f143175670614ddea79f87766f7208 WHIRLPOOL 67c532dd06a8d8110ce88fecae048a19197584f25d120766179906d54ec86887c6f987baba28e533617ee44c35a8c477c56011c45eaa87f91a123e6d96785a58
-DIST git-manpages-2.8.4.tar.xz 387168 SHA256 d2ddfc302e5b3c0ad182916b27c28d95bc667ea8b9db8dc099bf3d8d62b8b7f5 SHA512 d4ffca6ad8ff0b6bfab984eb06ad5c6c0cf73cfb4beaff4e924b2bd117a4a369e928faa2ca09f11903ebc52249ad24e2b68e7b571965a2ef48f5731ad94b9bef WHIRLPOOL a22d7ad38ccfb399325e321cecc7255fdf4ca05f14e92acfe94e74b816199d2e057a559f6e3eede2df768d762457eb2a43f1e9c76e8b6e76c7498dc9547dcf25
+EBUILD git-2.12.2.ebuild 18955 SHA256 26d5c2ea29e4c58df6865d3272e9af60648dba184625b0e10addb0298d6c04ae SHA512 de5e61bd25ef6ca10de8540c28d6aaeb7aebd04aa1d2b803a4fb6377894205e8de073c6abb70ac9d2dfbe096ede13ebe65f143175670614ddea79f87766f7208 WHIRLPOOL 67c532dd06a8d8110ce88fecae048a19197584f25d120766179906d54ec86887c6f987baba28e533617ee44c35a8c477c56011c45eaa87f91a123e6d96785a58
-DIST git-manpages-2.9.3.tar.xz 392648 SHA256 14e0e84af19b8d6b4f0b006b6e33486a0c40bca01e604e77f004efe564d54b4d SHA512 bc6ea4f517be4ff76b8f4b420173c9ba826095be3f6313e0dd2041198ee5b5af7ad07c10b9727aca992c7c4353272826408c42c5e7aeb6e75c6691a080eb9a77 WHIRLPOOL 1eb8f19cb7ac6dc6b90bc430b678512387727088933befef254a88704f0aa0057f8cac25fa574d1b7f6fa091401d62c70751a8b0b71e3ea85be619c936243d50
+EBUILD git-9999-r1.ebuild 18938 SHA256 6c6a59ebc96c70b79f9e8a45d1d5d2a292835cbd234fb8ba83d777984b071289 SHA512 b1b9b50f7d45ca5c529ae2b8a9f40034c8ec211b0ce2689648e8c0251fbff7c644fc3f34e5fdff71f91d6ae25e251bc890b292a42440a607c402d032388f9388 WHIRLPOOL d77fbb24a5ce0ec7c0eb53c01813f98bdd206df4ec39483bcf837cfe93269994b55375f9eb4e0fc961967ed42b27d6c54977e3a63270a693b581b4403af537ed
-EBUILD git-2.10.1.ebuild 19171 SHA256 9c2879743c7e831b2e77d46f7f7aa05fb4369f422641ad3211ccf25d004190c0 SHA512 4e412d0b48773d403628fb3f9466f71030e128862aeafc76d058d6cf2b1eac620a199e0321c1252d3baea4a9ca9500466983950866db4f12611b9f2ec76da17f WHIRLPOOL fc8267acd83bc03c09a3170d8aa5337a4a2d202662d8d2843b53882bf8fdbf33e9491a77e3f1e8d76d24babfcace1a5e87555351db4c969089bc414dcd2665a7
+EBUILD git-9999-r2.ebuild 18936 SHA256 a195532de56426d640211a54d15159fde6599e5e4bd46c10b105f84f162ca169 SHA512 c3e4a18aac7415da8173b44c153096bd6a32c7051c500a01a2fee665fefd16399495920b1ffcb376b839fc7fefa0f0525efb75fd69068069e2975bb726642251 WHIRLPOOL fd498a71490f20300c983d6b52f5d446ab6d3746a380315d11ca4483f3d4f44034d4ea05cc17c444f9fcc376e992ce94bb38f6cfc6c05be0704c429a5abb1e3b
-EBUILD git-2.10.2.ebuild 19171 SHA256 9c2879743c7e831b2e77d46f7f7aa05fb4369f422641ad3211ccf25d004190c0 SHA512 4e412d0b48773d403628fb3f9466f71030e128862aeafc76d058d6cf2b1eac620a199e0321c1252d3baea4a9ca9500466983950866db4f12611b9f2ec76da17f WHIRLPOOL fc8267acd83bc03c09a3170d8aa5337a4a2d202662d8d2843b53882bf8fdbf33e9491a77e3f1e8d76d24babfcace1a5e87555351db4c969089bc414dcd2665a7
+EBUILD git-9999-r3.ebuild 18934 SHA256 b9c35f6691aa812e6622c000d353547ae37a45a53009de86d1409153f9bae0a8 SHA512 b293eaba882ecde7bcec2001e5f5440aacda6b58e56f087bbb0eb49c6875badc7c5091f3f6c89f6db7b3cffddf092b47c494fcc4caf39bc51226d55662e10fa2 WHIRLPOOL 369318fd327c3401e7f08122751a2b2f1cd08837fd954e2e5994f59efa1eccd316307a1e8e33c558d66c9d5ecd38c29b960f3f2ef3b86fe7d636912d094e45ed
-EBUILD git-2.11.0_rc2.ebuild 19228 SHA256 40ca1ca5ca46948abf4965a236d25065dd705a9b9ac8bd9aa4a51c596e502fa3 SHA512 35b5e388697f3cf64a8ce7777e6dc72edf7c960a4ee2bd03c422813cac0e32f24508ab7bdc33f13d572f80653aec7e11248b3cce29e7c1633ddf3ef43db9dfd9 WHIRLPOOL 5e1ea4c354cf621de22d627748fc5c7d46132397e8238a8abca793a63b077b51ef9d6fefbea398194deeb092e544d47d22df2676d399bd1faca12e556c269d41
+EBUILD git-9999.ebuild 18937 SHA256 9ee8b9453597a9fe6ec53fdbecf3e1a42d2a0f7bc8df346918745ea13fe1b3bc SHA512 5ecf7f22359f1f9ad884507d7dc805b3997882a01440ecf3489bacf67d0e061632141c8f7b043ce7b8d9d9c130104343b5d142e398976600146481217b1d3b5b WHIRLPOOL 425479c673ba345c922695d7fd14aef61e788a46ec0cecee8587e2c1a7646c4f783bcb005bb988073645606632f20a4edaaa24b4247455edd7086bd57f0ff994
-EBUILD git-2.4.11.ebuild 17801 SHA256 6016c1c9a4239523d633d6889d3d2d0b4820779a9b22ce8cd6c9072f94929ccd SHA512 8ab3f434d228ebaefa197bf2918c81720f507c1b865b8ad21a9d2094378d46f946287cc5dbff72f319eb57318516a5f68788005b708e561d0ce08b7763406a7c WHIRLPOOL 6ea27ac3ab2aae9e7cfdf57df740fc2bd0b87d2291a280ae9d9f58bc089e2b0961835c697bc37f83e8f4382a5ceb0fb86d1e92552c2c55a186721d37198f5700
+MISC ChangeLog 27994 SHA256 ae0914321ef517b21a377da20d6b504a60d449e16301d416a91ec721f317b82d SHA512 3e005d091140e57221bc63fc801a78bab9442b733948ff61833ed84baa97f5cf5f4a7f4c23fb035ef11a80ae8d897ab5671205e6dbcc9e3473316514bf725079 WHIRLPOOL 3bace4900507085c37196e6543bffa4c6ef8a302332b37a0e5d1821c0205a6258ecbbc69e07bb93821e512dd74a79551d35299f2b1a03ce99fe762536be19106
 EBUILD git-2.5.5.ebuild 17987 SHA256 b88c0da9067596fd413f0db3629965e6704ea15e614d13d83be824a40ee9a5f5 SHA512 d3ab2c8894f558a4968e8cc77522e5f247cc6f9c87bef18f3272518561d9434d26d0104c2fe09dc82557e0d928f08b0c430d4341ea4561a5d37d2bed2841ff2b WHIRLPOOL bf7b4b0cd6c4fa2c5c4ea5d3662cd8bf5a50317dde5abde583d1bcf6fa30f9b00d7d69f544f82f0cd13ee46ec1b0ce7414d3640ffd67776219b454ac21dfb379
 EBUILD git-2.6.6.ebuild 17987 SHA256 b88c0da9067596fd413f0db3629965e6704ea15e614d13d83be824a40ee9a5f5 SHA512 d3ab2c8894f558a4968e8cc77522e5f247cc6f9c87bef18f3272518561d9434d26d0104c2fe09dc82557e0d928f08b0c430d4341ea4561a5d37d2bed2841ff2b WHIRLPOOL bf7b4b0cd6c4fa2c5c4ea5d3662cd8bf5a50317dde5abde583d1bcf6fa30f9b00d7d69f544f82f0cd13ee46ec1b0ce7414d3640ffd67776219b454ac21dfb379
 EBUILD git-2.7.3-r1.ebuild 18857 SHA256 6ae2d05d6aa356831b2c21b6f202cca29d7c07d527f00f9a02516dd3ab88a07b SHA512 55c1d98e8e43eb3222d6675ef745dbcefbd89656ea8807717ba3acd299d8854657764b36461da635a1be1259fad51e3dfd92ca5d239373ac1eef3c0c772dc542 WHIRLPOOL 0132ffe74409b4729895af899b5cddd6149c1de7518c9bbe67d8537c65e7a3eae61bf11bfeb317526464cc4067999f18a4c5fc2ef655b5830b1dbaa893eedb21
 EBUILD git-2.7.4.ebuild 18872 SHA256 cd3331c1455dbdaf25affe9b6cd54687a79fb066547b8f3ecb001d08e5c39b2a SHA512 dc1a0abd764ef99ed862fc84dc79c5675ea276be44ed459bd3a0d42241831041d3ea30a0b267528de690c79fee85507ef0901dbbb3f27b0852928bac4e99e3e9 WHIRLPOOL bfb87da979406a9f8e9f924ac75e77994441811547a55b7a48342bdca0a2190f630c23d3d381c16377b6e4e32b6a87c9b5743fef6698b60f8e7ce807170db30d
 EBUILD git-2.8.4.ebuild 19170 SHA256 46215343f2541a1cc204cfe0e63596fefa88d4e8b6a59f263ced5e178acbd77d SHA512 29cb980632c0bb199195fb1685b642c6a35f8cd6916d90fda8af29ea7fc9b0d9338e57ff2bcb87289d1bdc7ccf7bdb976d3ae99163f725a9c7414810ecb63d58 WHIRLPOOL c6d7f78bdb870fb6741c7c3579959936c1ee861d041339a193c7e0c198b0583a65d7f4485c247e8f29fe61e9e7118fcfa8baa6d8e2a2b36964050d909be5e5a9
 EBUILD git-2.9.3.ebuild 19170 SHA256 46215343f2541a1cc204cfe0e63596fefa88d4e8b6a59f263ced5e178acbd77d SHA512 29cb980632c0bb199195fb1685b642c6a35f8cd6916d90fda8af29ea7fc9b0d9338e57ff2bcb87289d1bdc7ccf7bdb976d3ae99163f725a9c7414810ecb63d58 WHIRLPOOL c6d7f78bdb870fb6741c7c3579959936c1ee861d041339a193c7e0c198b0583a65d7f4485c247e8f29fe61e9e7118fcfa8baa6d8e2a2b36964050d909be5e5a9
 EBUILD git-9999-r1.ebuild 19229 SHA256 b32032fce4686f43a6fc5a2d0f435a30c4ae01316b532c987f08c0b1635da60d SHA512 562004f6097c9e3858866d1bd9e6d49f41e04e82256a32f815586fcebaeda058aebdf06bcd0d00eadc153469fa51283b9e51123449f8493ee24aaa8c048fa413 WHIRLPOOL 9987663be3a854afd3a04676aaade78c53305df6eee9517e67342d23bd3ab44451e59b9f82c3bbce6e302342ecfa487cb8df927ac881342b9b9aaa3ed4fe61a6
 EBUILD git-9999-r2.ebuild 19227 SHA256 ebbf9a8e7541ab95cba15ebd22004f56caf83e2651c3130eafc41d0bd5b0efa0 SHA512 f33ad6f1a21279f0a92c821b46269e10c642a2b3aa87509e202f5ad758986dfe45be0dc01431488749e2ce8f13239b872a4de363a19d73defcb5c220c34bd6d0 WHIRLPOOL c721f9a982edc079a64d16b926f1e5c3d430bdb96e15fd3479ea129ab56f752a577eea02d60b9297c093df1f94f9b0e81414b09fc2400790e1976f3416e375e1
 EBUILD git-9999-r3.ebuild 19225 SHA256 3d9aa6c734b0a3684639d7654b83ae7809bbdd829caaf0e67345824d1b8417b2 SHA512 4d3fff0634069a03f8282fea83a0f59a770b7607ff0d3ca82c299fb2e5912d7acc824e9447b54445eecd28624d3b013c2d6525a1970d0ffcc8da8d642a84f5eb WHIRLPOOL 8350bc7979599dff307a1fb985d2bf1966d8e904d3e52650a3e6736805a4b3230f52b4a3ae86f42e4c483b5c7da229cba3338c2edaff870c2039046bfdc36d55
 EBUILD git-9999.ebuild 19228 SHA256 40ca1ca5ca46948abf4965a236d25065dd705a9b9ac8bd9aa4a51c596e502fa3 SHA512 35b5e388697f3cf64a8ce7777e6dc72edf7c960a4ee2bd03c422813cac0e32f24508ab7bdc33f13d572f80653aec7e11248b3cce29e7c1633ddf3ef43db9dfd9 WHIRLPOOL 5e1ea4c354cf621de22d627748fc5c7d46132397e8238a8abca793a63b077b51ef9d6fefbea398194deeb092e544d47d22df2676d399bd1faca12e556c269d41
 MISC ChangeLog 27343 SHA256 48777b0094e98286dec846626ae7892e5d9c5d1656dc56d2dac3ba408fc6ebbd SHA512 9591a9e658a4b4ea34a86495fa332f800d179bfd533ec989200404b028623fcbc55f97e4bc5a4eba083dae366efabac8b4a08264a2f84dfabeabbf64ed38ec98 WHIRLPOOL c2fa9288066c996a315b4443269b6ca781e73e5f52cbf78dc5f9624bd928bfc637f6aad8de8f2f35608dbb4fd43922e3e2cb28cd0dd7a592f327ebdcbd2dd5e5
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC ChangeLog-2015 29654 SHA256 82cc6b66c218365e83ce2e73618aeab54033aaa197e1a9d41dc8271352eea251 SHA512 2d8c2041e1c2ba5ceaa988b658ac3df5ae3ec333e3718f49147b293f5dc780e9aefc4af22b0ce870178bada6515fd5b2789c49d08337552835c861b3073ae752 WHIRLPOOL 845dea2b0ccec9fc651616c76d9f2821bde837428449dbd30e8dd1bc15bb91d54254a77b03e858f5c1fd3c314c5ad28833dc27dda5404af36191c8149254e27a
-MISC metadata.xml 2074 SHA256 e1527bc0d2dc4c23f6c757ee229240f979ee7af2aabb2dd5a49f13f7112c9fc5 SHA512 f5f040ea6db33e7e325c995994c82f92d727d2a6a5f7841a9fb3e28d1ac66fea3d153b09d3a66122ba6365bf7e76a2cb411757f5a706b5525414bda4f504b635 WHIRLPOOL ceff2ccac4564156e3c333b36c056129ea28ef30890d0be4394caa8f734d9e987e33a89a6903dd29d6b010a36b09bc87fa0303c905aff3bb4224b6860e10f283
+MISC metadata.xml 2160 SHA256 9285fe24f88560402bfeac116a5c062e65ffa6574fb787db3ba167cafcee5276 SHA512 67d96dcd049fc05add827d5869ecec470faf61219b76b738cf2cdd3bf4335bcdd66612509b2e8bd6609c45dc83146249a4c7154af70ff44765d22da7761e9daf WHIRLPOOL c2b9993398b86f2014be6843aa02b5b6a17afe7d8b726420acc042fefb35382998129ec7c52079079f6cbc8754dfd53f0083a999df907edbc7f921065c9f7d94
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.12.0-optional-cvs.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.12.0-optional-cvs.patch
@ -1,6 +1,6 @@
-From 4db842b8215a904e434f0f6265204129d64387b1 Mon Sep 17 00:00:00 2001
+From 1e1bacf32568cc24dbd24444ed4025fc80a96ff3 Mon Sep 17 00:00:00 2001
 From: Robin Johnson <robbat2@gentoo.org>
-Date: Tue, 7 Jun 2016 13:52:22 +0200
+Date: Sat, 25 Feb 2017 20:48:14 +0100
 Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
 utilities
@ -11,6 +11,8 @@ Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
 Forward-ported from v2.0.0_rc0 to v2.0.0
 Forward-ported from v2.0.0 to v2.2.2
 Forward-ported from v2.2.2 to v2.8.4
 Forward-ported from v2.8.4 to v2.10.0
 Forward-ported from v2.10.0 to v2.12.0
 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 ---
@ -26,10 +28,10 @@ Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 9 files changed, 120 insertions(+), 34 deletions(-)
 diff --git a/Makefile b/Makefile
-index de5a030..16ab4cd 100644
+index 8e4081e06..f14a4ad37 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -267,6 +267,8 @@ all::
+@@ -273,6 +273,8 @@ all::
 # Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep
 # and egrep that are pickier when their input contains non-ASCII data.
 #
@ -38,7 +40,7 @@ index de5a030..16ab4cd 100644
 # The TCL_PATH variable governs the location of the Tcl interpreter
 # used to optimize git-gui for your system.  Only used if NO_TCLTK
 # is not set.  Defaults to the bare 'tclsh'.
-@@ -473,6 +475,7 @@ LIB_OBJS =
+@@ -496,6 +498,7 @@ LIB_OBJS =
 PROGRAM_OBJS =
 PROGRAMS =
 SCRIPT_PERL =
@ -46,14 +48,13 @@ index de5a030..16ab4cd 100644
 SCRIPT_PYTHON =
 SCRIPT_SH =
 SCRIPT_LIB =
-@@ -510,13 +513,14 @@ SCRIPT_LIB += git-sh-i18n
+@@ -532,12 +535,13 @@ SCRIPT_LIB += git-sh-i18n
 SCRIPT_PERL += git-add--interactive.perl
 SCRIPT_PERL += git-difftool.perl
 SCRIPT_PERL += git-archimport.perl
 -SCRIPT_PERL += git-cvsexportcommit.perl
 -SCRIPT_PERL += git-cvsimport.perl
 -SCRIPT_PERL += git-cvsserver.perl
 SCRIPT_PERL += git-relink.perl
 SCRIPT_PERL += git-send-email.perl
 SCRIPT_PERL += git-svn.perl
@ -64,7 +65,7 @@ index de5a030..16ab4cd 100644
 SCRIPT_PYTHON += git-p4.py
 NO_INSTALL += git-remote-testgit
-@@ -524,24 +528,26 @@ NO_INSTALL += git-remote-testgit
+@@ -545,24 +549,26 @@ NO_INSTALL += git-remote-testgit
 # Generated files for scripts
 SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
 SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
@ -93,7 +94,7 @@ index de5a030..16ab4cd 100644
 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 install-python-script: $(SCRIPT_PYTHON_INS)
 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-@@ -550,12 +556,13 @@ install-python-script: $(SCRIPT_PYTHON_INS)
+@@ -571,12 +577,13 @@ install-python-script: $(SCRIPT_PYTHON_INS)
 clean-sh-script:
 	$(RM) $(SCRIPT_SH_GEN)
 clean-perl-script:
@ -108,8 +109,8 @@ index de5a030..16ab4cd 100644
 	  $(SCRIPT_PYTHON_INS) \
 	  git-instaweb
-@@ -1776,10 +1783,24 @@ git.res: git.rc GIT-VERSION-FILE
+@@ -1832,10 +1839,24 @@ git.res: git.rc GIT-VERSION-FILE
- 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
+ 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
 # This makes sure we depend on the NO_PERL setting itself.
 -$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
@ -135,7 +136,7 @@ index de5a030..16ab4cd 100644
 perl/perl.mak: perl/PM.stamp
-@@ -1792,7 +1813,7 @@ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
+@@ -1848,7 +1869,7 @@ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
 PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
@ -144,7 +145,7 @@ index de5a030..16ab4cd 100644
 	$(QUIET_GEN)$(RM) $@ $@+ && \
 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
 	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
-@@ -1826,14 +1847,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
+@@ -1882,14 +1903,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
 	chmod +x $@+ && \
 	mv $@+ $@
 else # NO_PERL
@ -166,17 +167,17 @@ index de5a030..16ab4cd 100644
 # This makes sure we depend on the NO_PYTHON setting itself.
 $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
-@@ -2064,7 +2089,7 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
+@@ -2125,7 +2150,7 @@ LOCALIZED_SH = $(SCRIPT_SH)
- XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
+ LOCALIZED_SH += git-parse-remote.sh
- LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
+ LOCALIZED_SH += git-rebase--interactive.sh
- LOCALIZED_SH = $(SCRIPT_SH) git-parse-remote.sh
+ LOCALIZED_SH += git-sh-setup.sh
 -LOCALIZED_PERL = $(SCRIPT_PERL)
 +LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS)
 ifdef XGETTEXT_INCLUDE_TESTS
 LOCALIZED_C += t/t0200/test.c
 diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
-index bb879a5..17be197 100755
+index bb879a527..17be19729 100755
 --- a/t/t9200-git-cvsexportcommit.sh
 +++ b/t/t9200-git-cvsexportcommit.sh
@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then
@ -192,7 +193,7 @@ index bb879a5..17be197 100755
 if test $? -ne 1
 then
 diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
-index 432c61d..6907b3f 100755
+index 432c61d24..6907b3f52 100755
 --- a/t/t9400-git-cvsserver-server.sh
 +++ b/t/t9400-git-cvsserver-server.sh
@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
@ -213,7 +214,7 @@ index 432c61d..6907b3f 100755
 if test $? -ne 1
 then
 diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
-index f324b9f..e1eed50 100755
+index 84787eee9..eecba8852 100755
 --- a/t/t9401-git-cvsserver-crlf.sh
 +++ b/t/t9401-git-cvsserver-crlf.sh
@@ -57,15 +57,20 @@ check_status_options() {
@ -243,7 +244,7 @@ index f324b9f..e1eed50 100755
 fi
 perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
 diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
-index 4c384ff..d601f32 100755
+index 4c384ff02..d601f32c5 100755
 --- a/t/t9600-cvsimport.sh
 +++ b/t/t9600-cvsimport.sh
@@ -3,14 +3,25 @@
@ -373,7 +374,7 @@ index 4c384ff..d601f32 100755
 test_done
 diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
-index 827d39f..d730a41 100755
+index 827d39f5b..d730a41f6 100755
 --- a/t/t9601-cvsimport-vendor-branch.sh
 +++ b/t/t9601-cvsimport-vendor-branch.sh
@@ -34,6 +34,17 @@
@ -395,7 +396,7 @@ index 827d39f..d730a41 100755
 test_expect_success PERL 'import a module with a vendor branch' '
 diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
-index e1db323..68f0974 100755
+index e1db323f5..68f097401 100755
 --- a/t/t9602-cvsimport-branches-tags.sh
 +++ b/t/t9602-cvsimport-branches-tags.sh
@@ -6,6 +6,17 @@
@ -417,7 +418,7 @@ index e1db323..68f0974 100755
 test_expect_success PERL 'import module' '
 diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
-index c4c3c49..9b2957d 100755
+index c4c3c4954..9b2957d4f 100755
 --- a/t/t9603-cvsimport-patchsets.sh
 +++ b/t/t9603-cvsimport-patchsets.sh
@@ -14,6 +14,17 @@
@ -439,10 +440,10 @@ index c4c3c49..9b2957d 100755
 test_expect_failure PERL 'import with criss cross times on revisions' '
 diff --git a/t/test-lib.sh b/t/test-lib.sh
-index 0055ebb..5b9bd2e 100644
+index 86d77c16d..1fb51f149 100644
 --- a/t/test-lib.sh
 +++ b/t/test-lib.sh
-@@ -969,6 +969,7 @@ case $(uname -s) in
+@@ -1007,6 +1007,7 @@ case $uname_s in
 esac
 ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
@ -451,5 +452,5 @@ index 0055ebb..5b9bd2e 100644
 test -z "$NO_PYTHON" && test_set_prereq PYTHON
 test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
 -- 
-2.8.3
+2.11.1
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.2.2-optional-cvs.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.2.2-optional-cvs.patch
@ -1,454 +0,0 @@
 From 12b82e03b971da618f19d0194dcf19a77b273766 Mon Sep 17 00:00:00 2001
 From: Robin Johnson <robbat2@gentoo.org>
 Date: Wed, 21 Jan 2015 20:48:03 +0100
 Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
 utilities
 Forward-ported from 1.7.12 to current git.git v1.8.4
 Forward-ported from v1.8.4 to v1.8.5.1
 Forward-ported from v1.8.5.3 to v1.9.0_rc3
 Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
 Forward-ported from v2.0.0_rc0 to v2.0.0
 Forward-ported from v2.0.0 to v2.2.2
 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 ---
 Makefile                           | 51 ++++++++++++++++++++++++++++----------
 t/t9200-git-cvsexportcommit.sh     |  5 ++++
 t/t9400-git-cvsserver-server.sh    |  8 +++++-
 t/t9401-git-cvsserver-crlf.sh      | 15 +++++++----
 t/t9600-cvsimport.sh               | 41 +++++++++++++++++++-----------
 t/t9601-cvsimport-vendor-branch.sh | 11 ++++++++
 t/t9602-cvsimport-branches-tags.sh | 11 ++++++++
 t/t9603-cvsimport-patchsets.sh     | 11 ++++++++
 t/test-lib.sh                      |  1 +
 9 files changed, 120 insertions(+), 34 deletions(-)
 diff --git a/Makefile b/Makefile
 index 7482a4d..a644c8d 100644
 --- a/Makefile
 +++ b/Makefile
@@ -254,6 +254,8 @@ all::
 #
 # Define NO_TCLTK if you do not want Tcl/Tk GUI.
 #
 +# Define NO_CVS if you do not want any CVS interface utilities.
 +#
 # The TCL_PATH variable governs the location of the Tcl interpreter
 # used to optimize git-gui for your system.  Only used if NO_TCLTK
 # is not set.  Defaults to the bare 'tclsh'.
@@ -433,6 +435,7 @@ LIB_OBJS =
 PROGRAM_OBJS =
 PROGRAMS =
 SCRIPT_PERL =
 +SCRIPT_PERL_CVS =
 SCRIPT_PYTHON =
 SCRIPT_SH =
 SCRIPT_LIB =
@@ -472,13 +475,14 @@ SCRIPT_LIB += git-sh-i18n
 SCRIPT_PERL += git-add--interactive.perl
 SCRIPT_PERL += git-difftool.perl
 SCRIPT_PERL += git-archimport.perl
 -SCRIPT_PERL += git-cvsexportcommit.perl
 -SCRIPT_PERL += git-cvsimport.perl
 -SCRIPT_PERL += git-cvsserver.perl
 SCRIPT_PERL += git-relink.perl
 SCRIPT_PERL += git-send-email.perl
 SCRIPT_PERL += git-svn.perl
 +SCRIPT_PERL_CVS += git-cvsexportcommit.perl
 +SCRIPT_PERL_CVS += git-cvsimport.perl
 +SCRIPT_PERL_CVS += git-cvsserver.perl
 +
 SCRIPT_PYTHON += git-p4.py
 NO_INSTALL += git-remote-testgit
@@ -486,24 +490,26 @@ NO_INSTALL += git-remote-testgit
 # Generated files for scripts
 SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
 SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
 +SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS))
 SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
 SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
 SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN))
 +SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN))
 SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN))
 # Individual rules to allow e.g.
 # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
 # from subdirectories like contrib/*/
 .PHONY: build-perl-script build-sh-script build-python-script
 -build-perl-script: $(SCRIPT_PERL_GEN)
 +build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
 build-sh-script: $(SCRIPT_SH_GEN)
 build-python-script: $(SCRIPT_PYTHON_GEN)
 .PHONY: install-perl-script install-sh-script install-python-script
 install-sh-script: $(SCRIPT_SH_INS)
 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 -install-perl-script: $(SCRIPT_PERL_INS)
 +install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS)
 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 install-python-script: $(SCRIPT_PYTHON_INS)
 	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
@@ -512,12 +518,13 @@ install-python-script: $(SCRIPT_PYTHON_INS)
 clean-sh-script:
 	$(RM) $(SCRIPT_SH_GEN)
 clean-perl-script:
 -	$(RM) $(SCRIPT_PERL_GEN)
 +	$(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
 clean-python-script:
 	$(RM) $(SCRIPT_PYTHON_GEN)
 SCRIPTS = $(SCRIPT_SH_INS) \
 	  $(SCRIPT_PERL_INS) \
 +	  $(SCRIPT_PERL_CVS_INS) \
 	  $(SCRIPT_PYTHON_INS) \
 	  git-instaweb
@@ -1677,10 +1684,24 @@ git.res: git.rc GIT-VERSION-FILE
 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
 # This makes sure we depend on the NO_PERL setting itself.
 -$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
 +$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS
 +
 +_SCRIPT_PERL_GEN =
 +_SCRIPT_PERL_NOGEN =
 ifndef NO_PERL
 -$(SCRIPT_PERL_GEN): perl/perl.mak
 +
 +_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN) 
 +
 +ifndef NO_CVS
 +_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN)
 +else
 +_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN)
 +_REASON = NO_CVS
 +_REASON_CONTENT = $(NO_CVS)
 +endif # NO_CVS
 +
 +$(_SCRIPT_PERL_GEN): perl/perl.mak
 perl/perl.mak: perl/PM.stamp
@@ -1693,7 +1714,7 @@ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
 PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
 -$(SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
 +$(_SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
 	$(QUIET_GEN)$(RM) $@ $@+ && \
 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
 	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
@@ -1727,14 +1748,18 @@ git-instaweb: git-instaweb.sh gitweb GIT-SCRIPT-DEFINES
 	chmod +x $@+ && \
 	mv $@+ $@
 else # NO_PERL
 -$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
 +_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb
 +_REASON = NO_PERL
 +_REASON_CONTENT = $(NO_PERL)
 +endif # NO_PERL
 +
 +$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh
 	$(QUIET_GEN)$(RM) $@ $@+ && \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 -	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
 +	    -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \
 	    unimplemented.sh >$@+ && \
 	chmod +x $@+ && \
 	mv $@+ $@
 -endif # NO_PERL
 # This makes sure we depend on the NO_PYTHON setting itself.
 $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
@@ -1964,7 +1989,7 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
 XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
 LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
 LOCALIZED_SH = $(SCRIPT_SH)
 -LOCALIZED_PERL = $(SCRIPT_PERL)
 +LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS)
 ifdef XGETTEXT_INCLUDE_TESTS
 LOCALIZED_C += t/t0200/test.c
 diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
 index 812c9cd..906532a 100755
 --- a/t/t9200-git-cvsexportcommit.sh
 +++ b/t/t9200-git-cvsexportcommit.sh
@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then
 	test_done
 fi
 +if ! test_have_prereq CVS; then
 +	skip_all='skipping git cvsexportcommit tests, cvs not available'
 +	test_done
 +fi
 +
 cvs >/dev/null 2>&1
 if test $? -ne 1
 then
 diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
 index 6146c3f..2a675e3 100755
 --- a/t/t9400-git-cvsserver-server.sh
 +++ b/t/t9400-git-cvsserver-server.sh
@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
 . ./test-lib.sh
 if ! test_have_prereq PERL; then
 -	skip_all='skipping git cvsserver tests, perl not available'
 +	skip_all='skipping git-cvsserver tests, perl not available'
 	test_done
 fi
 +
 +if ! test_have_prereq CVS; then
 +	skip_all='skipping git-cvsserver tests, cvs not available'
 +	test_done
 +fi
 +
 cvs >/dev/null 2>&1
 if test $? -ne 1
 then
 diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
 index 5a4ed28..04814cb 100755
 --- a/t/t9401-git-cvsserver-crlf.sh
 +++ b/t/t9401-git-cvsserver-crlf.sh
@@ -57,15 +57,20 @@ check_status_options() {
     return $stat
 }
 -cvs >/dev/null 2>&1
 -if test $? -ne 1
 +if ! test_have_prereq PERL
 then
 -    skip_all='skipping git-cvsserver tests, cvs not found'
 +    skip_all='skipping git-cvsserver tests, perl not available'
     test_done
 fi
 -if ! test_have_prereq PERL
 +if ! test_have_prereq CVS
 then
 -    skip_all='skipping git-cvsserver tests, perl not available'
 +    skip_all='skipping git-cvsserver tests, cvs not available'
 +    test_done
 +fi
 +cvs >/dev/null 2>&1
 +if test $? -ne 1
 +then
 +    skip_all='skipping git-cvsserver tests, cvs not found'
     test_done
 fi
 perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
 diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
 index 4c384ff..d601f32 100755
 --- a/t/t9600-cvsimport.sh
 +++ b/t/t9600-cvsimport.sh
@@ -3,14 +3,25 @@
 test_description='git cvsimport basic tests'
 . ./lib-cvs.sh
 -test_expect_success PERL 'setup cvsroot environment' '
 +if ! test_have_prereq PERL
 +then
 +    skip_all='skipping git cvsimport tests, perl not available'
 +    test_done
 +fi
 +if ! test_have_prereq CVS
 +then
 +    skip_all='skipping git cvsimport tests, cvs not available'
 +    test_done
 +fi
 +
 +test_expect_success 'setup cvsroot environment' '
 	CVSROOT=$(pwd)/cvsroot &&
 	export CVSROOT
 '
 -test_expect_success PERL 'setup cvsroot' '$CVS init'
 +test_expect_success 'setup cvsroot' '$CVS init'
 -test_expect_success PERL 'setup a cvs module' '
 +test_expect_success 'setup a cvs module' '
 	mkdir "$CVSROOT/module" &&
 	$CVS co -d module-cvs module &&
@@ -42,23 +53,23 @@ EOF
 	)
 '
 -test_expect_success PERL 'import a trivial module' '
 +test_expect_success 'import a trivial module' '
 	git cvsimport -a -R -z 0 -C module-git module &&
 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
 '
 -test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
 +test_expect_success 'pack refs' '(cd module-git && git gc)'
 -test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
 +test_expect_success 'initial import has correct .git/cvs-revisions' '
 	(cd module-git &&
 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
 	test_cmp expected module-git/.git/cvs-revisions
 '
 -test_expect_success PERL 'update cvs module' '
 +test_expect_success 'update cvs module' '
 	(cd module-cvs &&
 	cat <<EOF >o_fortuna &&
 O Fortune,
@@ -86,7 +97,7 @@ EOF
 	)
 '
 -test_expect_success PERL 'update git module' '
 +test_expect_success 'update git module' '
 	(cd module-git &&
 	git config cvsimport.trackRevisions true &&
@@ -97,7 +108,7 @@ test_expect_success PERL 'update git module' '
 '
 -test_expect_success PERL 'update has correct .git/cvs-revisions' '
 +test_expect_success 'update has correct .git/cvs-revisions' '
 	(cd module-git &&
 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
@@ -105,7 +116,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' '
 	test_cmp expected module-git/.git/cvs-revisions
 '
 -test_expect_success PERL 'update cvs module' '
 +test_expect_success 'update cvs module' '
 	(cd module-cvs &&
 		echo 1 >tick &&
@@ -114,7 +125,7 @@ test_expect_success PERL 'update cvs module' '
 	)
 '
 -test_expect_success PERL 'cvsimport.module config works' '
 +test_expect_success 'cvsimport.module config works' '
 	(cd module-git &&
 		git config cvsimport.module module &&
@@ -126,7 +137,7 @@ test_expect_success PERL 'cvsimport.module config works' '
 '
 -test_expect_success PERL 'second update has correct .git/cvs-revisions' '
 +test_expect_success 'second update has correct .git/cvs-revisions' '
 	(cd module-git &&
 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
@@ -135,7 +146,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
 	test_cmp expected module-git/.git/cvs-revisions
 '
 -test_expect_success PERL 'import from a CVS working tree' '
 +test_expect_success 'import from a CVS working tree' '
 	$CVS co -d import-from-wt module &&
 	(cd import-from-wt &&
@@ -148,12 +159,12 @@ test_expect_success PERL 'import from a CVS working tree' '
 '
 -test_expect_success PERL 'no .git/cvs-revisions created by default' '
 +test_expect_success 'no .git/cvs-revisions created by default' '
 	! test -e import-from-wt/.git/cvs-revisions
 '
 -test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
 +test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
 test_done
 diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
 index 827d39f..d730a41 100755
 --- a/t/t9601-cvsimport-vendor-branch.sh
 +++ b/t/t9601-cvsimport-vendor-branch.sh
@@ -34,6 +34,17 @@
 test_description='git cvsimport handling of vendor branches'
 . ./lib-cvs.sh
 +if ! test_have_prereq PERL
 +then
 +    skip_all='skipping git cvsimport tests, perl not available'
 +    test_done
 +fi
 +if ! test_have_prereq CVS
 +then
 +    skip_all='skipping git cvsimport tests, cvs not available'
 +    test_done
 +fi
 +
 setup_cvs_test_repository t9601
 test_expect_success PERL 'import a module with a vendor branch' '
 diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
 index e1db323..68f0974 100755
 --- a/t/t9602-cvsimport-branches-tags.sh
 +++ b/t/t9602-cvsimport-branches-tags.sh
@@ -6,6 +6,17 @@
 test_description='git cvsimport handling of branches and tags'
 . ./lib-cvs.sh
 +if ! test_have_prereq PERL
 +then
 +    skip_all='skipping git cvsimport tests, perl not available'
 +    test_done
 +fi
 +if ! test_have_prereq CVS
 +then
 +    skip_all='skipping git cvsimport tests, cvs not available'
 +    test_done
 +fi
 +
 setup_cvs_test_repository t9602
 test_expect_success PERL 'import module' '
 diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
 index c4c3c49..9b2957d 100755
 --- a/t/t9603-cvsimport-patchsets.sh
 +++ b/t/t9603-cvsimport-patchsets.sh
@@ -14,6 +14,17 @@
 test_description='git cvsimport testing for correct patchset estimation'
 . ./lib-cvs.sh
 +if ! test_have_prereq PERL
 +then
 +    skip_all='skipping git cvsimport tests, perl not available'
 +    test_done
 +fi
 +if ! test_have_prereq CVS
 +then
 +    skip_all='skipping git cvsimport tests, cvs not available'
 +    test_done
 +fi
 +
 setup_cvs_test_repository t9603
 test_expect_failure PERL 'import with criss cross times on revisions' '
 diff --git a/t/test-lib.sh b/t/test-lib.sh
 index 79e8a33..c7c4b48 100644
 --- a/t/test-lib.sh
 +++ b/t/test-lib.sh
@@ -929,6 +929,7 @@ case $(uname -s) in
 esac
 ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
 +test -z "$NO_CVS" && test_set_prereq CVS
 test -z "$NO_PERL" && test_set_prereq PERL
 test -z "$NO_PYTHON" && test_set_prereq PYTHON
 test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
 -- 
 2.2.1
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon-r1.initd
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon-r1.initd
@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 pidfile="/var/run/git-daemon.pid"
 command="/usr/bin/git"
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon_at.service
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon_at.service
@ -1,13 +0,0 @@
 [Unit]
 Description=Git Repositories Server Daemon
 Documentation=man:git-daemon(1)
 [Service]
 User=nobody
 Group=nobody
 EnvironmentFile=/etc/conf.d/git-daemon
 # Ignore non-zero exit status, access error makes git-daemon return them
 ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose $GITDAEMON_OPTS
 StandardInput=socket
 StandardOutput=inherit
 StandardError=journal
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.10.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.10.1.ebuild
@ -1,678 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python2_7 )
 [[ ${PV} == *9999 ]] && SCM="git-r3"
 # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
 # See https://git-scm.com/docs/gitworkflows#_graduation
 # In order of stability:
 # 9999-r0: maint
 # 9999-r1: master
 # 9999-r2: next
 # 9999-r3: pu
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
 EGIT_BRANCH=maint
 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
 inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
 MY_PV="${PV/_rc/.rc}"
 MY_P="${PN}-${MY_PV}"
 DOC_VER=${MY_PV}
 DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
 	gnome-keyring? ( gnome-base/libgnome-keyring )"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
 	mediawiki? (
 		dev-perl/DateTime-Format-ISO8601
 		dev-perl/HTML-Tree
 		dev-perl/MediaWiki-API
 	)
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
 #   .xml/docbook  --(docbook2texi.pl)--> .texi
 #   .texi         --(makeinfo)---------> .info
 DEPEND="${CDEPEND}
 	doc? (
 		app-text/asciidoc
 		app-text/docbook2X
 		sys-apps/texinfo
 		app-text/xmlto
 	)
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)"
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
 	DEPEND="${DEPEND}
 		app-text/asciidoc"
 fi
 SITEFILE=50${PN}-gentoo.el
 S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
 	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
 	"${FILESDIR}"/git-2.10.0-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
 	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
 	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
 	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
 )
 pkg_setup() {
 	if use subversion && has_version "dev-vcs/subversion[dso]"; then
 		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
 		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
 		ewarn "have been warned."
 	fi
 	if use python ; then
 		python-single-r1_pkg_setup
 	fi
 }
 # This is needed because for some obscure reasons future calls to make don't
 # pick up these exports if we export them in src_unpack()
 exportmakeopts() {
 	local myopts
 	if use blksha1 ; then
 		myopts+=" BLK_SHA1=YesPlease"
 	elif use ppcsha1 ; then
 		myopts+=" PPC_SHA1=YesPlease"
 	fi
 	if use curl ; then
 		use webdav || myopts+=" NO_EXPAT=YesPlease"
 	else
 		myopts+=" NO_CURL=YesPlease"
 	fi
 	# broken assumptions, because of broken build system ...
 	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
 	myopts+=" INSTALL=install TAR=tar"
 	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
 	myopts+=" SANE_TOOL_PATH="
 	myopts+=" OLD_ICONV="
 	myopts+=" NO_EXTERNAL_GREP="
 	# For svn-fe
 	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
 	# can't define this to null, since the entire makefile depends on it
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 	use iconv \
 		|| myopts+=" NO_ICONV=YesPlease"
 	use nls \
 		|| myopts+=" NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts+=" NO_TCLTK=YesPlease"
 	use pcre \
 		&& myopts+=" USE_LIBPCRE=yes" \
 		&& extlibs+=" -lpcre"
 	use perl \
 		&& myopts+=" INSTALLDIRS=vendor" \
 		|| myopts+=" NO_PERL=YesPlease"
 	use python \
 		|| myopts+=" NO_PYTHON=YesPlease"
 	use subversion \
 		|| myopts+=" NO_SVN_TESTS=YesPlease"
 	use threads \
 		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
 #		myopts+=" NO_IPV6=YesPlease"
 #		myopts+=" NO_STRLCPY=YesPlease"
 #		myopts+=" NO_MEMMEM=YesPlease"
 #		myopts+=" NO_MKDTEMP=YesPlease"
 #		myopts+=" NO_MKSTEMPS=YesPlease"
 #	fi
 	if [[ ${CHOST} == ia64-*-hpux* ]]; then
 		myopts+=" NO_NSEC=YesPlease"
 	fi
 	if [[ ${CHOST} == *-*-aix* ]]; then
 		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
 	fi
 	if [[ ${CHOST} == *-solaris* ]]; then
 		myopts+=" NEEDS_LIBICONV=YesPlease"
 		myopts+=" HAVE_CLOCK_MONOTONIC=1"
 		myopts+=" HAVE_GETDELIM=1"
 	fi
 	has_version '>=app-text/asciidoc-8.0' \
 		&& myopts+=" ASCIIDOC8=YesPlease"
 	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
 	[[ "${CHOST}" == *-uclibc* ]] && \
 		myopts+=" NO_NSEC=YesPlease"
 	export MY_MAKEOPTS="${myopts}"
 	export EXTLIBS="${extlibs}"
 }
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		use doc && \
 			cd "${S}"/Documentation && \
 			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 	else
 		git-r3_src_unpack
 		cd "${S}"
 		#cp "${FILESDIR}"/GIT-VERSION-GEN .
 	fi
 }
 src_prepare() {
 	# add experimental patches to improve mediawiki support
 	# see patches for origin
 	if use mediawiki-experimental ; then
 		PATCHES+=(
 			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
 			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
 			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
 		)
 	fi
 	default
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
 		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
 		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
 		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		Makefile contrib/svn-fe/Makefile || die "sed failed"
 	# Never install the private copy of Error.pm (bug #296310)
 	sed -i \
 		-e '/private-Error.pm/s,^,#,' \
 		perl/Makefile.PL
 	# Fix docbook2texi command
 	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
 		Documentation/Makefile || die "sed failed"
 	# Fix git-subtree missing DESTDIR
 	sed -i \
 		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
 		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
 		contrib/subtree/Makefile
 }
 git_emake() {
 	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
 	emake ${MY_MAKEOPTS} \
 		DESTDIR="${D}" \
 		OPTCFLAGS="${CFLAGS}" \
 		OPTLDFLAGS="${LDFLAGS}" \
 		OPTCC="$(tc-getCC)" \
 		OPTAR="$(tc-getAR)" \
 		prefix="${EPREFIX}"/usr \
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
 	# This is the fix for bug #326625, but it also causes breakage, see bug
 	# #352693.
 	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 src_configure() {
 	exportmakeopts
 }
 src_compile() {
 	if use perl ; then
 	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
 	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
 	fi
 	git_emake || die "emake failed"
 	if use emacs ; then
 		elisp-compile contrib/emacs/git{,-blame}.el
 	fi
 	if use perl && use cgi ; then
 		git_emake \
 			gitweb \
 			|| die "emake gitweb (cgi) failed"
 	fi
 	if [[ ${CHOST} == *-darwin* ]]; then
 		cd "${S}"/contrib/credential/osxkeychain || die
 		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
 			|| die "emake credential-osxkeychain"
 	fi
 	cd "${S}"/Documentation
 	if [[ ${PV} == *9999 ]] ; then
 		git_emake man \
 			|| die "emake man failed"
 		if use doc ; then
 			git_emake info html \
 				|| die "emake info html failed"
 		fi
 	else
 		if use doc ; then
 			git_emake info \
 				|| die "emake info html failed"
 		fi
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		# by defining EXTLIBS we override the detection for libintl and
 		# libiconv, bug #516168
 		local nlsiconv=
 		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
 		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
 		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi
 		cd "${S}"
 	fi
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		git_emake || die "emake git-credential-gnome-keyring failed"
 	fi
 	cd "${S}"/contrib/subtree
 	git_emake
 	use doc && git_emake doc
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake
 	fi
 }
 src_install() {
 	git_emake \
 		install || \
 		die "make install failed"
 	if [[ ${CHOST} == *-darwin* ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
 	use doc && dodir /usr/share/doc/${PF}/html
 	for d in / /howto/ /technical/ ; do
 		docinto ${d}
 		dodoc Documentation${d}*.txt
 		if use doc ; then
 			docinto ${d}/html
 			dodoc Documentation${d}*.html
 		fi
 	done
 	docinto /
 	# Upstream does not ship this pre-built :-(
 	use doc && doinfo Documentation/{git,gitman}.info
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
 	# Not really a bash-completion file (bug #477920)
 	# but still needed uncompressed (bug #507480)
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 	if use emacs ; then
 		elisp-install ${PN} contrib/emacs/git.{el,elc}
 		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
 		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
 		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
 	exeinto /usr/libexec/git-core/
 	newexe contrib/git-resurrect.sh git-resurrect
 	# git-subtree
 	cd "${S}"/contrib/subtree
 	git_emake install || die "Failed to emake install git-subtree"
 	if use doc ; then
 		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
 	cd "${S}"
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake install
 		cd "${S}"
 	fi
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
 	# git-jump
 	exeinto /usr/libexec/git-core/
 	doexe contrib/git-jump/git-jump
 	newdoc contrib/git-jump/README git-jump.txt
 	# git-contacts
 	exeinto /usr/libexec/git-core/
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		dobin git-credential-gnome-keyring
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		dobin svn-fe
 		dodoc svn-fe.txt
 		if use doc ; then
 			doman svn-fe.1
 			docinto html
 			dodoc svn-fe.html
 		fi
 		cd "${S}"
 	fi
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
 	# p4import - excluded because fast-import has a better one
 	# patches - stuff the Git guys made to go upstream to other places
 	# persistent-https - TODO
 	# mw-to-git - TODO
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
 	for i in \
 		buildsystems convert-objects fast-import \
 		hg-to-git hooks remotes2config.sh rerere-train.sh \
 		stats workdir \
 		; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
 			|| die "Failed contrib ${i}"
 	done
 	if use perl && use cgi ; then
 		# We used to install in /usr/share/${PN}/gitweb
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
 		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
 		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
 		newdoc  "${S}"/gitweb/README README.gitweb
 		find "${ED}"/usr/lib64/perl5/ \
 			-name .packlist \
 			-exec rm \{\} \;
 	else
 		rm -rf "${ED}"/usr/share/gitweb
 	fi
 	if ! use subversion ; then
 		rm -f "${ED}"/usr/libexec/git-core/git-svn \
 			"${ED}"/usr/share/man/man1/git-svn.1*
 	fi
 	if use xinetd ; then
 		insinto /etc/xinetd.d
 		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
 	fi
 	if use !prefix ; then
 		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
 		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
 		systemd_dounit "${FILESDIR}/git-daemon.socket"
 	fi
 	perl_delete_localpod
 	# Remove disabled linguas
 	# we could remove sources in src_prepare, but install does not
 	# handle missing locale dir well
 	rm_loc() {
 		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
 	l10n_for_each_disabled_locale_do rm_loc
 }
 src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
 					t9402-git-cvsserver-refs.sh \
 					t9600-cvsimport.sh \
 					t9601-cvsimport-vendor-branch.sh \
 					t9602-cvsimport-branches-tags.sh \
 					t9603-cvsimport-patchsets.sh \
 					t9604-cvsimport-timestamps.sh"
 	local tests_perl="t3701-add-interactive.sh \
 					t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh \
 					t7106-reset-unborn-branch.sh \
 					t7501-commit.sh"
 	# Bug #225601 - t0004 is not suitable for root perm
 	# Bug #219839 - t1004 is not suitable for root perm
 	# t0001-init.sh - check for init notices EPERM*  fails
 	local tests_nonroot="t0001-init.sh \
 		t0004-unwritable.sh \
 		t0070-fundamental.sh \
 		t1004-read-tree-m-u-wf.sh \
 		t3700-add.sh \
 		t7300-clean.sh"
 	# t9100 still fails with symlinks in SVN 1.7
 	local test_svn="t9100-git-svn-basic.sh"
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
 		disabled="${disabled} t5000-tar-tree.sh"
 	fi
 	cvs=0
 	use cvs && let cvs=$cvs+1
 	if [[ ${EUID} -eq 0 ]]; then
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
 			has_version "dev-vcs/cvs[server]" && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
 		disabled="${disabled} ${tests_perl}"
 	fi
 	einfo "Disabling tests that fail with SVN 1.7"
 	disabled="${disabled} ${test_svn}"
 	# Reset all previously disabled tests
 	cd "${S}/t"
 	for i in *.sh.DISABLED ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
 	done
 	einfo "Disabled tests:"
 	for i in ${disabled} ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
 	done
 	# Avoid the test system removing the results because we want them ourselves
 	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
 		-i "${S}"/t/Makefile
 	# Clean old results first, must always run
 	cd "${S}/t"
 	nonfatal git_emake clean
 	# Now run the tests, keep going if we hit an error, and don't terminate on
 	# failure
 	cd "${S}"
 	einfo "Start test run"
 	#MAKEOPTS=-j1
 	nonfatal git_emake --keep-going test
 	rc=$?
 	# Display nice results, now print the results
 	cd "${S}/t"
 	nonfatal git_emake aggregate-results
 	# And bail if there was a problem
 	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
 }
 showpkgdeps() {
 	local pkg=$1
 	shift
 	elog "  $(printf "%-17s:" ${pkg}) ${@}"
 }
 pkg_postinst() {
 	use emacs && elisp-site-regen
 	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
 	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
 	einfo "Note that the prompt bash code is now in that separate script"
 	elog "These additional scripts need some dependencies:"
 	echo
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-instaweb \
 		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
 pkg_postrm() {
 	use emacs && elisp-site-regen
 }
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.10.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.10.2.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
@ -37,7 +36,7 @@ if [[ ${PV} != *9999 ]]; then
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
@ -191,6 +190,8 @@ exportmakeopts() {
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 	use elibc_musl \
 		&& myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.11.0_rc2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.11.0_rc2.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
@ -38,7 +37,7 @@ if [[ ${PV} != *9999 ]]; then
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
@ -192,6 +191,8 @@ exportmakeopts() {
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 	use elibc_musl \
 		&& myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.12.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.12.1.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
@ -32,22 +31,24 @@ HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
 	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	libsecret? ( app-crypt/libsecret )
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
@ -57,7 +58,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
+"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
@ -73,12 +74,8 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	python? ( gtk?
+	python? ( ${PYTHON_DEPS} )
-	(
+"
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
@ -110,13 +107,12 @@ REQUIRED_USE="
 	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.8.4-optional-cvs.patch
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
@ -191,6 +187,8 @@ exportmakeopts() {
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 	use elibc_musl \
 		&& myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
@ -360,12 +358,12 @@ src_compile() {
 		cd "${S}"
 	fi
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-gnome-keyring failed"
+		git_emake || die "emake git-credential-libsecret failed"
 	fi
-	cd "${S}"/contrib/subtree
+	cd "${S}"/contrib/subtree || die
 	git_emake
 	use doc && git_emake doc
@ -419,11 +417,6 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@ -460,9 +453,9 @@ src_install() {
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-gnome-keyring
+		dobin git-credential-libsecret
 	fi
 	if use subversion ; then
@ -480,7 +473,6 @@ src_install() {
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
@ -493,11 +485,17 @@ src_install() {
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
+	local contrib_objects=(
-		buildsystems convert-objects fast-import \
+		buildsystems
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		fast-import
-		stats workdir \
+		hg-to-git
-		; do
+		hooks
 		remotes2config.sh
 		rerere-train.sh
 		stats
 		workdir
 	)
 	for i in "${contrib_objects[@]}" ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
@ -554,7 +552,7 @@ src_install() {
 }
 src_test() {
-	local disabled=""
+	local disabled="t9128-git-svn-cmd-branch.sh"
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.12.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.12.2.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
@ -32,22 +31,24 @@ HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
 	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	libsecret? ( app-crypt/libsecret )
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
@ -57,7 +58,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
+"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
@ -73,12 +74,8 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	python? ( gtk?
+	python? ( ${PYTHON_DEPS} )
-	(
+"
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
@ -110,13 +107,12 @@ REQUIRED_USE="
 	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.8.4-optional-cvs.patch
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
@ -191,6 +187,8 @@ exportmakeopts() {
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 	use elibc_musl \
 		&& myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
@ -360,12 +358,12 @@ src_compile() {
 		cd "${S}"
 	fi
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-gnome-keyring failed"
+		git_emake || die "emake git-credential-libsecret failed"
 	fi
-	cd "${S}"/contrib/subtree
+	cd "${S}"/contrib/subtree || die
 	git_emake
 	use doc && git_emake doc
@ -419,11 +417,6 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@ -460,9 +453,9 @@ src_install() {
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-gnome-keyring
+		dobin git-credential-libsecret
 	fi
 	if use subversion ; then
@ -480,7 +473,6 @@ src_install() {
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
@ -493,11 +485,17 @@ src_install() {
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
+	local contrib_objects=(
-		buildsystems convert-objects fast-import \
+		buildsystems
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		fast-import
-		stats workdir \
+		hg-to-git
-		; do
+		hooks
 		remotes2config.sh
 		rerere-train.sh
 		stats
 		workdir
 	)
 	for i in "${contrib_objects[@]}" ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
@ -554,7 +552,7 @@ src_install() {
 }
 src_test() {
-	local disabled=""
+	local disabled="t9128-git-svn-cmd-branch.sh"
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.4.11.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.4.11.ebuild
@ -1,633 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python2_7 )
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
 EGIT_MASTER=pu
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
 MY_PV="${PV/_rc/.rc}"
 MY_P="${PN}-${MY_PV}"
 DOC_VER=${MY_PV}
 DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	dev-libs/openssl:0=
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
 	gnome-keyring? ( gnome-base/libgnome-keyring )"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
 	mediawiki? (
 		dev-perl/DateTime-Format-ISO8601
 		dev-perl/HTML-Tree
 		dev-perl/MediaWiki-API
 	)
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
 #   .xml/docbook  --(docbook2texi.pl)--> .texi
 #   .texi         --(makeinfo)---------> .info
 DEPEND="${CDEPEND}
 	doc? (
 		app-text/asciidoc
 		app-text/docbook2X
 		sys-apps/texinfo
 		app-text/xmlto
 	)
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)"
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
 	DEPEND="${DEPEND}
 		app-text/asciidoc"
 fi
 SITEFILE=50${PN}-gentoo.el
 S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 pkg_setup() {
 	if use subversion && has_version "dev-vcs/subversion[dso]"; then
 		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
 		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
 		ewarn "have been warned."
 	fi
 	if use python ; then
 		python-single-r1_pkg_setup
 	fi
 }
 # This is needed because for some obscure reasons future calls to make don't
 # pick up these exports if we export them in src_unpack()
 exportmakeopts() {
 	local myopts
 	if use blksha1 ; then
 		myopts+=" BLK_SHA1=YesPlease"
 	elif use ppcsha1 ; then
 		myopts+=" PPC_SHA1=YesPlease"
 	fi
 	if use curl ; then
 		use webdav || myopts+=" NO_EXPAT=YesPlease"
 	else
 		myopts+=" NO_CURL=YesPlease"
 	fi
 	# broken assumptions, because of broken build system ...
 	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
 	myopts+=" INSTALL=install TAR=tar"
 	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
 	myopts+=" SANE_TOOL_PATH="
 	myopts+=" OLD_ICONV="
 	myopts+=" NO_EXTERNAL_GREP="
 	# For svn-fe
 	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
 	# can't define this to null, since the entire makefile depends on it
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 	use iconv \
 		|| myopts+=" NO_ICONV=YesPlease"
 	use nls \
 		|| myopts+=" NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts+=" NO_TCLTK=YesPlease"
 	use pcre \
 		&& myopts+=" USE_LIBPCRE=yes" \
 		&& extlibs+=" -lpcre"
 	use perl \
 		&& myopts+=" INSTALLDIRS=vendor" \
 		|| myopts+=" NO_PERL=YesPlease"
 	use python \
 		|| myopts+=" NO_PYTHON=YesPlease"
 	use subversion \
 		|| myopts+=" NO_SVN_TESTS=YesPlease"
 	use threads \
 		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
 #		myopts+=" NO_IPV6=YesPlease"
 #		myopts+=" NO_STRLCPY=YesPlease"
 #		myopts+=" NO_MEMMEM=YesPlease"
 #		myopts+=" NO_MKDTEMP=YesPlease"
 #		myopts+=" NO_MKSTEMPS=YesPlease"
 #	fi
 	if [[ ${CHOST} == ia64-*-hpux* ]]; then
 		myopts+=" NO_NSEC=YesPlease"
 	fi
 	if [[ ${CHOST} == *-*-aix* ]]; then
 		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
 	fi
 	if [[ ${CHOST} == *-solaris* ]]; then
 		myopts+=" NEEDS_LIBICONV=YesPlease"
 	fi
 	has_version '>=app-text/asciidoc-8.0' \
 		&& myopts+=" ASCIIDOC8=YesPlease"
 	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
 	[[ "${CHOST}" == *-uclibc* ]] && \
 		myopts+=" NO_NSEC=YesPlease"
 	export MY_MAKEOPTS="${myopts}"
 	export EXTLIBS="${extlibs}"
 }
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		use doc && \
 			cd "${S}"/Documentation && \
 			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 	else
 		git-2_src_unpack
 		cd "${S}"
 		#cp "${FILESDIR}"/GIT-VERSION-GEN .
 	fi
 }
 src_prepare() {
 	# bug #350330 - automagic CVS when we don't want it is bad.
 	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
 	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
 	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 	epatch_user
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
 		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
 		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
 		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		Makefile contrib/svn-fe/Makefile || die "sed failed"
 	# Never install the private copy of Error.pm (bug #296310)
 	sed -i \
 		-e '/private-Error.pm/s,^,#,' \
 		perl/Makefile.PL
 	# Fix docbook2texi command
 	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
 		Documentation/Makefile || die "sed failed"
 	# Fix git-subtree missing DESTDIR
 	sed -i \
 		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
 		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
 		contrib/subtree/Makefile
 }
 git_emake() {
 	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
 	emake ${MY_MAKEOPTS} \
 		DESTDIR="${D}" \
 		OPTCFLAGS="${CFLAGS}" \
 		OPTLDFLAGS="${LDFLAGS}" \
 		OPTCC="$(tc-getCC)" \
 		OPTAR="$(tc-getAR)" \
 		prefix="${EPREFIX}"/usr \
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
 	# This is the fix for bug #326625, but it also causes breakage, see bug
 	# #352693.
 	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 src_configure() {
 	exportmakeopts
 }
 src_compile() {
 	if use perl ; then
 	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
 	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
 	fi
 	git_emake || die "emake failed"
 	if use emacs ; then
 		elisp-compile contrib/emacs/git{,-blame}.el
 	fi
 	if use perl && use cgi ; then
 		git_emake \
 			gitweb \
 			|| die "emake gitweb (cgi) failed"
 	fi
 	if [[ ${CHOST} == *-darwin* ]]; then
 		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
 		git_emake || die "emake credential-osxkeychain"
 	fi
 	cd "${S}"/Documentation
 	if [[ ${PV} == *9999 ]] ; then
 		git_emake man \
 			|| die "emake man failed"
 		if use doc ; then
 			git_emake info html \
 				|| die "emake info html failed"
 		fi
 	else
 		if use doc ; then
 			git_emake info \
 				|| die "emake info html failed"
 		fi
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		# by defining EXTLIBS we override the detection for libintl and
 		# libiconv, bug #516168
 		local nlsiconv=
 		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
 		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
 		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi
 		cd "${S}"
 	fi
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		git_emake || die "emake git-credential-gnome-keyring failed"
 	fi
 	cd "${S}"/contrib/subtree
 	git_emake
 	use doc && git_emake doc
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake
 	fi
 }
 src_install() {
 	git_emake \
 		install || \
 		die "make install failed"
 	if [[ ${CHOST} == *-darwin* ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
 	use doc && dodir /usr/share/doc/${PF}/html
 	for d in / /howto/ /technical/ ; do
 		docinto ${d}
 		dodoc Documentation${d}*.txt
 		use doc && dohtml -p ${d} Documentation${d}*.html
 	done
 	docinto /
 	# Upstream does not ship this pre-built :-(
 	use doc && doinfo Documentation/{git,gitman}.info
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
 	# Not really a bash-completion file (bug #477920)
 	# but still needed uncompressed (bug #507480)
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 	if use emacs ; then
 		elisp-install ${PN} contrib/emacs/git.{el,elc}
 		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
 		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
 		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
 	exeinto /usr/libexec/git-core/
 	newexe contrib/git-resurrect.sh git-resurrect
 	# git-subtree
 	cd "${S}"/contrib/subtree
 	git_emake install || die "Failed to emake install git-subtree"
 	if use doc ; then
 		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
 	cd "${S}"
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake install
 		cd "${S}"
 	fi
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
 	# git-jump
 	exeinto /usr/libexec/git-core/
 	doexe contrib/git-jump/git-jump
 	newdoc contrib/git-jump/README git-jump.txt
 	# git-contacts
 	exeinto /usr/libexec/git-core/
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		dobin git-credential-gnome-keyring
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		dobin svn-fe
 		dodoc svn-fe.txt
 		use doc && doman svn-fe.1 && dohtml svn-fe.html
 		cd "${S}"
 	fi
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
 	# p4import - excluded because fast-import has a better one
 	# patches - stuff the Git guys made to go upstream to other places
 	# persistent-https - TODO
 	# mw-to-git - TODO
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
 	for i in \
 		buildsystems convert-objects fast-import \
 		hg-to-git hooks remotes2config.sh rerere-train.sh \
 		stats workdir \
 		; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
 			|| die "Failed contrib ${i}"
 	done
 	if use perl && use cgi ; then
 		# We used to install in /usr/share/${PN}/gitweb
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
 		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
 		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
 		newdoc  "${S}"/gitweb/README README.gitweb
 		find "${ED}"/usr/lib64/perl5/ \
 			-name .packlist \
 			-exec rm \{\} \;
 	else
 		rm -rf "${ED}"/usr/share/gitweb
 	fi
 	if ! use subversion ; then
 		rm -f "${ED}"/usr/libexec/git-core/git-svn \
 			"${ED}"/usr/share/man/man1/git-svn.1*
 	fi
 	if use xinetd ; then
 		insinto /etc/xinetd.d
 		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
 	fi
 	if use !prefix ; then
 		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
 		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
 		systemd_dounit "${FILESDIR}/git-daemon.socket"
 	fi
 	perl_delete_localpod
 }
 src_test() {
 	local disabled="" #t7004-tag.sh" #520270
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
 					t9402-git-cvsserver-refs.sh \
 					t9600-cvsimport.sh \
 					t9601-cvsimport-vendor-branch.sh \
 					t9602-cvsimport-branches-tags.sh \
 					t9603-cvsimport-patchsets.sh \
 					t9604-cvsimport-timestamps.sh"
 	local tests_perl="t3701-add-interactive.sh \
 					t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh \
 					t7106-reset-unborn-branch.sh \
 					t7501-commit.sh"
 	# Bug #225601 - t0004 is not suitable for root perm
 	# Bug #219839 - t1004 is not suitable for root perm
 	# t0001-init.sh - check for init notices EPERM*  fails
 	local tests_nonroot="t0001-init.sh \
 		t0004-unwritable.sh \
 		t0070-fundamental.sh \
 		t1004-read-tree-m-u-wf.sh \
 		t3700-add.sh \
 		t7300-clean.sh"
 	# t9100 still fails with symlinks in SVN 1.7
 	local test_svn="t9100-git-svn-basic.sh"
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
 		disabled="${disabled} t5000-tar-tree.sh"
 	fi
 	cvs=0
 	use cvs && let cvs=$cvs+1
 	if [[ ${EUID} -eq 0 ]]; then
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
 			has_version "dev-vcs/cvs[server]" && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
 		disabled="${disabled} ${tests_perl}"
 	fi
 	einfo "Disabling tests that fail with SVN 1.7"
 	disabled="${disabled} ${test_svn}"
 	# Reset all previously disabled tests
 	cd "${S}/t"
 	for i in *.sh.DISABLED ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
 	done
 	einfo "Disabled tests:"
 	for i in ${disabled} ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
 	done
 	# Avoid the test system removing the results because we want them ourselves
 	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
 		-i "${S}"/t/Makefile
 	# Clean old results first, must always run
 	cd "${S}/t"
 	nonfatal git_emake clean
 	# Now run the tests, keep going if we hit an error, and don't terminate on
 	# failure
 	cd "${S}"
 	einfo "Start test run"
 	#MAKEOPTS=-j1
 	nonfatal git_emake --keep-going test
 	rc=$?
 	# Display nice results, now print the results
 	cd "${S}/t"
 	nonfatal git_emake aggregate-results
 	# And bail if there was a problem
 	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
 }
 showpkgdeps() {
 	local pkg=$1
 	shift
 	elog "  $(printf "%-17s:" ${pkg}) ${@}"
 }
 pkg_postinst() {
 	use emacs && elisp-site-regen
 	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
 	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
 	einfo "Note that the prompt bash code is now in that separate script"
 	elog "These additional scripts need some dependencies:"
 	echo
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-instaweb \
 		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
 	echo
 }
 pkg_postrm() {
 	use emacs && elisp-site-regen
 }
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.5.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.5.5.ebuild
@ -1,637 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python2_7 )
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
 EGIT_MASTER=pu
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
 MY_PV="${PV/_rc/.rc}"
 MY_P="${PN}-${MY_PV}"
 DOC_VER=${MY_PV}
 DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
 	gnome-keyring? ( gnome-base/libgnome-keyring )"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
 	mediawiki? (
 		dev-perl/DateTime-Format-ISO8601
 		dev-perl/HTML-Tree
 		dev-perl/MediaWiki-API
 	)
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
 #   .xml/docbook  --(docbook2texi.pl)--> .texi
 #   .texi         --(makeinfo)---------> .info
 DEPEND="${CDEPEND}
 	doc? (
 		app-text/asciidoc
 		app-text/docbook2X
 		sys-apps/texinfo
 		app-text/xmlto
 	)
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)"
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
 	DEPEND="${DEPEND}
 		app-text/asciidoc"
 fi
 SITEFILE=50${PN}-gentoo.el
 S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 pkg_setup() {
 	if use subversion && has_version "dev-vcs/subversion[dso]"; then
 		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
 		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
 		ewarn "have been warned."
 	fi
 	if use python ; then
 		python-single-r1_pkg_setup
 	fi
 }
 # This is needed because for some obscure reasons future calls to make don't
 # pick up these exports if we export them in src_unpack()
 exportmakeopts() {
 	local myopts
 	if use blksha1 ; then
 		myopts+=" BLK_SHA1=YesPlease"
 	elif use ppcsha1 ; then
 		myopts+=" PPC_SHA1=YesPlease"
 	fi
 	if use curl ; then
 		use webdav || myopts+=" NO_EXPAT=YesPlease"
 	else
 		myopts+=" NO_CURL=YesPlease"
 	fi
 	# broken assumptions, because of broken build system ...
 	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
 	myopts+=" INSTALL=install TAR=tar"
 	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
 	myopts+=" SANE_TOOL_PATH="
 	myopts+=" OLD_ICONV="
 	myopts+=" NO_EXTERNAL_GREP="
 	# For svn-fe
 	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
 	# can't define this to null, since the entire makefile depends on it
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 	use iconv \
 		|| myopts+=" NO_ICONV=YesPlease"
 	use nls \
 		|| myopts+=" NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts+=" NO_TCLTK=YesPlease"
 	use pcre \
 		&& myopts+=" USE_LIBPCRE=yes" \
 		&& extlibs+=" -lpcre"
 	use perl \
 		&& myopts+=" INSTALLDIRS=vendor" \
 		|| myopts+=" NO_PERL=YesPlease"
 	use python \
 		|| myopts+=" NO_PYTHON=YesPlease"
 	use subversion \
 		|| myopts+=" NO_SVN_TESTS=YesPlease"
 	use threads \
 		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
 #		myopts+=" NO_IPV6=YesPlease"
 #		myopts+=" NO_STRLCPY=YesPlease"
 #		myopts+=" NO_MEMMEM=YesPlease"
 #		myopts+=" NO_MKDTEMP=YesPlease"
 #		myopts+=" NO_MKSTEMPS=YesPlease"
 #	fi
 	if [[ ${CHOST} == ia64-*-hpux* ]]; then
 		myopts+=" NO_NSEC=YesPlease"
 	fi
 	if [[ ${CHOST} == *-*-aix* ]]; then
 		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
 	fi
 	if [[ ${CHOST} == *-solaris* ]]; then
 		myopts+=" NEEDS_LIBICONV=YesPlease"
 	fi
 	has_version '>=app-text/asciidoc-8.0' \
 		&& myopts+=" ASCIIDOC8=YesPlease"
 	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
 	[[ "${CHOST}" == *-uclibc* ]] && \
 		myopts+=" NO_NSEC=YesPlease"
 	export MY_MAKEOPTS="${myopts}"
 	export EXTLIBS="${extlibs}"
 }
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		use doc && \
 			cd "${S}"/Documentation && \
 			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 	else
 		git-2_src_unpack
 		cd "${S}"
 		#cp "${FILESDIR}"/GIT-VERSION-GEN .
 	fi
 }
 src_prepare() {
 	# bug #350330 - automagic CVS when we don't want it is bad.
 	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
 	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
 	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
 	epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
 	epatch_user
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
 		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
 		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
 		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		Makefile contrib/svn-fe/Makefile || die "sed failed"
 	# Never install the private copy of Error.pm (bug #296310)
 	sed -i \
 		-e '/private-Error.pm/s,^,#,' \
 		perl/Makefile.PL
 	# Fix docbook2texi command
 	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
 		Documentation/Makefile || die "sed failed"
 	# Fix git-subtree missing DESTDIR
 	sed -i \
 		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
 		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
 		contrib/subtree/Makefile
 }
 git_emake() {
 	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
 	emake ${MY_MAKEOPTS} \
 		DESTDIR="${D}" \
 		OPTCFLAGS="${CFLAGS}" \
 		OPTLDFLAGS="${LDFLAGS}" \
 		OPTCC="$(tc-getCC)" \
 		OPTAR="$(tc-getAR)" \
 		prefix="${EPREFIX}"/usr \
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
 	# This is the fix for bug #326625, but it also causes breakage, see bug
 	# #352693.
 	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 src_configure() {
 	exportmakeopts
 }
 src_compile() {
 	if use perl ; then
 	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
 	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
 	fi
 	git_emake || die "emake failed"
 	if use emacs ; then
 		elisp-compile contrib/emacs/git{,-blame}.el
 	fi
 	if use perl && use cgi ; then
 		git_emake \
 			gitweb \
 			|| die "emake gitweb (cgi) failed"
 	fi
 	if [[ ${CHOST} == *-darwin* ]]; then
 		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
 		git_emake || die "emake credential-osxkeychain"
 	fi
 	cd "${S}"/Documentation
 	if [[ ${PV} == *9999 ]] ; then
 		git_emake man \
 			|| die "emake man failed"
 		if use doc ; then
 			git_emake info html \
 				|| die "emake info html failed"
 		fi
 	else
 		if use doc ; then
 			git_emake info \
 				|| die "emake info html failed"
 		fi
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		# by defining EXTLIBS we override the detection for libintl and
 		# libiconv, bug #516168
 		local nlsiconv=
 		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
 		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
 		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi
 		cd "${S}"
 	fi
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		git_emake || die "emake git-credential-gnome-keyring failed"
 	fi
 	cd "${S}"/contrib/subtree
 	git_emake
 	use doc && git_emake doc
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake
 	fi
 }
 src_install() {
 	git_emake \
 		install || \
 		die "make install failed"
 	if [[ ${CHOST} == *-darwin* ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
 	use doc && dodir /usr/share/doc/${PF}/html
 	for d in / /howto/ /technical/ ; do
 		docinto ${d}
 		dodoc Documentation${d}*.txt
 		use doc && dohtml -p ${d} Documentation${d}*.html
 	done
 	docinto /
 	# Upstream does not ship this pre-built :-(
 	use doc && doinfo Documentation/{git,gitman}.info
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
 	# Not really a bash-completion file (bug #477920)
 	# but still needed uncompressed (bug #507480)
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 	if use emacs ; then
 		elisp-install ${PN} contrib/emacs/git.{el,elc}
 		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
 		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
 		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
 	exeinto /usr/libexec/git-core/
 	newexe contrib/git-resurrect.sh git-resurrect
 	# git-subtree
 	cd "${S}"/contrib/subtree
 	git_emake install || die "Failed to emake install git-subtree"
 	if use doc ; then
 		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
 	cd "${S}"
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake install
 		cd "${S}"
 	fi
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
 	# git-jump
 	exeinto /usr/libexec/git-core/
 	doexe contrib/git-jump/git-jump
 	newdoc contrib/git-jump/README git-jump.txt
 	# git-contacts
 	exeinto /usr/libexec/git-core/
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		dobin git-credential-gnome-keyring
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		dobin svn-fe
 		dodoc svn-fe.txt
 		use doc && doman svn-fe.1 && dohtml svn-fe.html
 		cd "${S}"
 	fi
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
 	# p4import - excluded because fast-import has a better one
 	# patches - stuff the Git guys made to go upstream to other places
 	# persistent-https - TODO
 	# mw-to-git - TODO
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
 	for i in \
 		buildsystems convert-objects fast-import \
 		hg-to-git hooks remotes2config.sh rerere-train.sh \
 		stats workdir \
 		; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
 			|| die "Failed contrib ${i}"
 	done
 	if use perl && use cgi ; then
 		# We used to install in /usr/share/${PN}/gitweb
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
 		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
 		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
 		newdoc  "${S}"/gitweb/README README.gitweb
 		find "${ED}"/usr/lib64/perl5/ \
 			-name .packlist \
 			-exec rm \{\} \;
 	else
 		rm -rf "${ED}"/usr/share/gitweb
 	fi
 	if ! use subversion ; then
 		rm -f "${ED}"/usr/libexec/git-core/git-svn \
 			"${ED}"/usr/share/man/man1/git-svn.1*
 	fi
 	if use xinetd ; then
 		insinto /etc/xinetd.d
 		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
 	fi
 	if use !prefix ; then
 		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
 		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
 		systemd_dounit "${FILESDIR}/git-daemon.socket"
 	fi
 	perl_delete_localpod
 }
 src_test() {
 	local disabled="" #t7004-tag.sh" #520270
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
 					t9402-git-cvsserver-refs.sh \
 					t9600-cvsimport.sh \
 					t9601-cvsimport-vendor-branch.sh \
 					t9602-cvsimport-branches-tags.sh \
 					t9603-cvsimport-patchsets.sh \
 					t9604-cvsimport-timestamps.sh"
 	local tests_perl="t3701-add-interactive.sh \
 					t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh \
 					t7106-reset-unborn-branch.sh \
 					t7501-commit.sh"
 	# Bug #225601 - t0004 is not suitable for root perm
 	# Bug #219839 - t1004 is not suitable for root perm
 	# t0001-init.sh - check for init notices EPERM*  fails
 	local tests_nonroot="t0001-init.sh \
 		t0004-unwritable.sh \
 		t0070-fundamental.sh \
 		t1004-read-tree-m-u-wf.sh \
 		t3700-add.sh \
 		t7300-clean.sh"
 	# t9100 still fails with symlinks in SVN 1.7
 	local test_svn="t9100-git-svn-basic.sh"
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
 		disabled="${disabled} t5000-tar-tree.sh"
 	fi
 	cvs=0
 	use cvs && let cvs=$cvs+1
 	if [[ ${EUID} -eq 0 ]]; then
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
 			has_version "dev-vcs/cvs[server]" && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
 		disabled="${disabled} ${tests_perl}"
 	fi
 	einfo "Disabling tests that fail with SVN 1.7"
 	disabled="${disabled} ${test_svn}"
 	# Reset all previously disabled tests
 	cd "${S}/t"
 	for i in *.sh.DISABLED ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
 	done
 	einfo "Disabled tests:"
 	for i in ${disabled} ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
 	done
 	# Avoid the test system removing the results because we want them ourselves
 	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
 		-i "${S}"/t/Makefile
 	# Clean old results first, must always run
 	cd "${S}/t"
 	nonfatal git_emake clean
 	# Now run the tests, keep going if we hit an error, and don't terminate on
 	# failure
 	cd "${S}"
 	einfo "Start test run"
 	#MAKEOPTS=-j1
 	nonfatal git_emake --keep-going test
 	rc=$?
 	# Display nice results, now print the results
 	cd "${S}/t"
 	nonfatal git_emake aggregate-results
 	# And bail if there was a problem
 	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
 }
 showpkgdeps() {
 	local pkg=$1
 	shift
 	elog "  $(printf "%-17s:" ${pkg}) ${@}"
 }
 pkg_postinst() {
 	use emacs && elisp-site-regen
 	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
 	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
 	einfo "Note that the prompt bash code is now in that separate script"
 	elog "These additional scripts need some dependencies:"
 	echo
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-instaweb \
 		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
 	echo
 }
 pkg_postrm() {
 	use emacs && elisp-site-regen
 }
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.6.6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.6.6.ebuild
@ -1,637 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python2_7 )
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
 EGIT_MASTER=pu
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
 MY_PV="${PV/_rc/.rc}"
 MY_P="${PN}-${MY_PV}"
 DOC_VER=${MY_PV}
 DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
 	gnome-keyring? ( gnome-base/libgnome-keyring )"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
 	mediawiki? (
 		dev-perl/DateTime-Format-ISO8601
 		dev-perl/HTML-Tree
 		dev-perl/MediaWiki-API
 	)
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
 #   .xml/docbook  --(docbook2texi.pl)--> .texi
 #   .texi         --(makeinfo)---------> .info
 DEPEND="${CDEPEND}
 	doc? (
 		app-text/asciidoc
 		app-text/docbook2X
 		sys-apps/texinfo
 		app-text/xmlto
 	)
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)"
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
 	DEPEND="${DEPEND}
 		app-text/asciidoc"
 fi
 SITEFILE=50${PN}-gentoo.el
 S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 pkg_setup() {
 	if use subversion && has_version "dev-vcs/subversion[dso]"; then
 		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
 		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
 		ewarn "have been warned."
 	fi
 	if use python ; then
 		python-single-r1_pkg_setup
 	fi
 }
 # This is needed because for some obscure reasons future calls to make don't
 # pick up these exports if we export them in src_unpack()
 exportmakeopts() {
 	local myopts
 	if use blksha1 ; then
 		myopts+=" BLK_SHA1=YesPlease"
 	elif use ppcsha1 ; then
 		myopts+=" PPC_SHA1=YesPlease"
 	fi
 	if use curl ; then
 		use webdav || myopts+=" NO_EXPAT=YesPlease"
 	else
 		myopts+=" NO_CURL=YesPlease"
 	fi
 	# broken assumptions, because of broken build system ...
 	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
 	myopts+=" INSTALL=install TAR=tar"
 	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
 	myopts+=" SANE_TOOL_PATH="
 	myopts+=" OLD_ICONV="
 	myopts+=" NO_EXTERNAL_GREP="
 	# For svn-fe
 	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
 	# can't define this to null, since the entire makefile depends on it
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 	use iconv \
 		|| myopts+=" NO_ICONV=YesPlease"
 	use nls \
 		|| myopts+=" NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts+=" NO_TCLTK=YesPlease"
 	use pcre \
 		&& myopts+=" USE_LIBPCRE=yes" \
 		&& extlibs+=" -lpcre"
 	use perl \
 		&& myopts+=" INSTALLDIRS=vendor" \
 		|| myopts+=" NO_PERL=YesPlease"
 	use python \
 		|| myopts+=" NO_PYTHON=YesPlease"
 	use subversion \
 		|| myopts+=" NO_SVN_TESTS=YesPlease"
 	use threads \
 		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
 #		myopts+=" NO_IPV6=YesPlease"
 #		myopts+=" NO_STRLCPY=YesPlease"
 #		myopts+=" NO_MEMMEM=YesPlease"
 #		myopts+=" NO_MKDTEMP=YesPlease"
 #		myopts+=" NO_MKSTEMPS=YesPlease"
 #	fi
 	if [[ ${CHOST} == ia64-*-hpux* ]]; then
 		myopts+=" NO_NSEC=YesPlease"
 	fi
 	if [[ ${CHOST} == *-*-aix* ]]; then
 		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
 	fi
 	if [[ ${CHOST} == *-solaris* ]]; then
 		myopts+=" NEEDS_LIBICONV=YesPlease"
 	fi
 	has_version '>=app-text/asciidoc-8.0' \
 		&& myopts+=" ASCIIDOC8=YesPlease"
 	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
 	[[ "${CHOST}" == *-uclibc* ]] && \
 		myopts+=" NO_NSEC=YesPlease"
 	export MY_MAKEOPTS="${myopts}"
 	export EXTLIBS="${extlibs}"
 }
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		use doc && \
 			cd "${S}"/Documentation && \
 			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 	else
 		git-2_src_unpack
 		cd "${S}"
 		#cp "${FILESDIR}"/GIT-VERSION-GEN .
 	fi
 }
 src_prepare() {
 	# bug #350330 - automagic CVS when we don't want it is bad.
 	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
 	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
 	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
 	epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
 	epatch_user
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
 		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
 		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
 		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		Makefile contrib/svn-fe/Makefile || die "sed failed"
 	# Never install the private copy of Error.pm (bug #296310)
 	sed -i \
 		-e '/private-Error.pm/s,^,#,' \
 		perl/Makefile.PL
 	# Fix docbook2texi command
 	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
 		Documentation/Makefile || die "sed failed"
 	# Fix git-subtree missing DESTDIR
 	sed -i \
 		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
 		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
 		contrib/subtree/Makefile
 }
 git_emake() {
 	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
 	emake ${MY_MAKEOPTS} \
 		DESTDIR="${D}" \
 		OPTCFLAGS="${CFLAGS}" \
 		OPTLDFLAGS="${LDFLAGS}" \
 		OPTCC="$(tc-getCC)" \
 		OPTAR="$(tc-getAR)" \
 		prefix="${EPREFIX}"/usr \
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
 	# This is the fix for bug #326625, but it also causes breakage, see bug
 	# #352693.
 	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 src_configure() {
 	exportmakeopts
 }
 src_compile() {
 	if use perl ; then
 	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
 	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
 	fi
 	git_emake || die "emake failed"
 	if use emacs ; then
 		elisp-compile contrib/emacs/git{,-blame}.el
 	fi
 	if use perl && use cgi ; then
 		git_emake \
 			gitweb \
 			|| die "emake gitweb (cgi) failed"
 	fi
 	if [[ ${CHOST} == *-darwin* ]]; then
 		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
 		git_emake || die "emake credential-osxkeychain"
 	fi
 	cd "${S}"/Documentation
 	if [[ ${PV} == *9999 ]] ; then
 		git_emake man \
 			|| die "emake man failed"
 		if use doc ; then
 			git_emake info html \
 				|| die "emake info html failed"
 		fi
 	else
 		if use doc ; then
 			git_emake info \
 				|| die "emake info html failed"
 		fi
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		# by defining EXTLIBS we override the detection for libintl and
 		# libiconv, bug #516168
 		local nlsiconv=
 		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
 		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
 		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi
 		cd "${S}"
 	fi
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		git_emake || die "emake git-credential-gnome-keyring failed"
 	fi
 	cd "${S}"/contrib/subtree
 	git_emake
 	use doc && git_emake doc
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake
 	fi
 }
 src_install() {
 	git_emake \
 		install || \
 		die "make install failed"
 	if [[ ${CHOST} == *-darwin* ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
 	use doc && dodir /usr/share/doc/${PF}/html
 	for d in / /howto/ /technical/ ; do
 		docinto ${d}
 		dodoc Documentation${d}*.txt
 		use doc && dohtml -p ${d} Documentation${d}*.html
 	done
 	docinto /
 	# Upstream does not ship this pre-built :-(
 	use doc && doinfo Documentation/{git,gitman}.info
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
 	# Not really a bash-completion file (bug #477920)
 	# but still needed uncompressed (bug #507480)
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 	if use emacs ; then
 		elisp-install ${PN} contrib/emacs/git.{el,elc}
 		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
 		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
 		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
 	exeinto /usr/libexec/git-core/
 	newexe contrib/git-resurrect.sh git-resurrect
 	# git-subtree
 	cd "${S}"/contrib/subtree
 	git_emake install || die "Failed to emake install git-subtree"
 	if use doc ; then
 		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
 	cd "${S}"
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake install
 		cd "${S}"
 	fi
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
 	# git-jump
 	exeinto /usr/libexec/git-core/
 	doexe contrib/git-jump/git-jump
 	newdoc contrib/git-jump/README git-jump.txt
 	# git-contacts
 	exeinto /usr/libexec/git-core/
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		dobin git-credential-gnome-keyring
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		dobin svn-fe
 		dodoc svn-fe.txt
 		use doc && doman svn-fe.1 && dohtml svn-fe.html
 		cd "${S}"
 	fi
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
 	# p4import - excluded because fast-import has a better one
 	# patches - stuff the Git guys made to go upstream to other places
 	# persistent-https - TODO
 	# mw-to-git - TODO
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
 	for i in \
 		buildsystems convert-objects fast-import \
 		hg-to-git hooks remotes2config.sh rerere-train.sh \
 		stats workdir \
 		; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
 			|| die "Failed contrib ${i}"
 	done
 	if use perl && use cgi ; then
 		# We used to install in /usr/share/${PN}/gitweb
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
 		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
 		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
 		newdoc  "${S}"/gitweb/README README.gitweb
 		find "${ED}"/usr/lib64/perl5/ \
 			-name .packlist \
 			-exec rm \{\} \;
 	else
 		rm -rf "${ED}"/usr/share/gitweb
 	fi
 	if ! use subversion ; then
 		rm -f "${ED}"/usr/libexec/git-core/git-svn \
 			"${ED}"/usr/share/man/man1/git-svn.1*
 	fi
 	if use xinetd ; then
 		insinto /etc/xinetd.d
 		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
 	fi
 	if use !prefix ; then
 		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
 		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
 		systemd_dounit "${FILESDIR}/git-daemon.socket"
 	fi
 	perl_delete_localpod
 }
 src_test() {
 	local disabled="" #t7004-tag.sh" #520270
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
 					t9402-git-cvsserver-refs.sh \
 					t9600-cvsimport.sh \
 					t9601-cvsimport-vendor-branch.sh \
 					t9602-cvsimport-branches-tags.sh \
 					t9603-cvsimport-patchsets.sh \
 					t9604-cvsimport-timestamps.sh"
 	local tests_perl="t3701-add-interactive.sh \
 					t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh \
 					t7106-reset-unborn-branch.sh \
 					t7501-commit.sh"
 	# Bug #225601 - t0004 is not suitable for root perm
 	# Bug #219839 - t1004 is not suitable for root perm
 	# t0001-init.sh - check for init notices EPERM*  fails
 	local tests_nonroot="t0001-init.sh \
 		t0004-unwritable.sh \
 		t0070-fundamental.sh \
 		t1004-read-tree-m-u-wf.sh \
 		t3700-add.sh \
 		t7300-clean.sh"
 	# t9100 still fails with symlinks in SVN 1.7
 	local test_svn="t9100-git-svn-basic.sh"
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
 		disabled="${disabled} t5000-tar-tree.sh"
 	fi
 	cvs=0
 	use cvs && let cvs=$cvs+1
 	if [[ ${EUID} -eq 0 ]]; then
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
 			has_version "dev-vcs/cvs[server]" && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
 		disabled="${disabled} ${tests_perl}"
 	fi
 	einfo "Disabling tests that fail with SVN 1.7"
 	disabled="${disabled} ${test_svn}"
 	# Reset all previously disabled tests
 	cd "${S}/t"
 	for i in *.sh.DISABLED ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
 	done
 	einfo "Disabled tests:"
 	for i in ${disabled} ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
 	done
 	# Avoid the test system removing the results because we want them ourselves
 	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
 		-i "${S}"/t/Makefile
 	# Clean old results first, must always run
 	cd "${S}/t"
 	nonfatal git_emake clean
 	# Now run the tests, keep going if we hit an error, and don't terminate on
 	# failure
 	cd "${S}"
 	einfo "Start test run"
 	#MAKEOPTS=-j1
 	nonfatal git_emake --keep-going test
 	rc=$?
 	# Display nice results, now print the results
 	cd "${S}/t"
 	nonfatal git_emake aggregate-results
 	# And bail if there was a problem
 	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
 }
 showpkgdeps() {
 	local pkg=$1
 	shift
 	elog "  $(printf "%-17s:" ${pkg}) ${@}"
 }
 pkg_postinst() {
 	use emacs && elisp-site-regen
 	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
 	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
 	einfo "Note that the prompt bash code is now in that separate script"
 	elog "These additional scripts need some dependencies:"
 	echo
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-instaweb \
 		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
 	echo
 }
 pkg_postrm() {
 	use emacs && elisp-site-regen
 }
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.7.3-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.7.3-r1.ebuild
@ -1,662 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python2_7 )
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
 EGIT_MASTER=pu
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
 MY_PV="${PV/_rc/.rc}"
 MY_P="${PN}-${MY_PV}"
 DOC_VER=${MY_PV}
 DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			https://dev.gentoo.org/~robbat2/distfiles/git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
 	gnome-keyring? ( gnome-base/libgnome-keyring )"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
 	mediawiki? (
 		dev-perl/DateTime-Format-ISO8601
 		dev-perl/HTML-Tree
 		dev-perl/MediaWiki-API
 	)
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
 #   .xml/docbook  --(docbook2texi.pl)--> .texi
 #   .texi         --(makeinfo)---------> .info
 DEPEND="${CDEPEND}
 	doc? (
 		app-text/asciidoc
 		app-text/docbook2X
 		sys-apps/texinfo
 		app-text/xmlto
 	)
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)"
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
 	DEPEND="${DEPEND}
 		app-text/asciidoc"
 fi
 SITEFILE=50${PN}-gentoo.el
 S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
 	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
 	"${FILESDIR}"/git-2.2.2-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
 	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
 	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
 	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
 	# http://www.openwall.com/lists/oss-security/2016/03/16/9
 	# 2.7.3 did not actually contain the fix, it only went into master.
 	"${DISTDIR}"/git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch
 )
 pkg_setup() {
 	if use subversion && has_version "dev-vcs/subversion[dso]"; then
 		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
 		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
 		ewarn "have been warned."
 	fi
 	if use python ; then
 		python-single-r1_pkg_setup
 	fi
 }
 # This is needed because for some obscure reasons future calls to make don't
 # pick up these exports if we export them in src_unpack()
 exportmakeopts() {
 	local myopts
 	if use blksha1 ; then
 		myopts+=" BLK_SHA1=YesPlease"
 	elif use ppcsha1 ; then
 		myopts+=" PPC_SHA1=YesPlease"
 	fi
 	if use curl ; then
 		use webdav || myopts+=" NO_EXPAT=YesPlease"
 	else
 		myopts+=" NO_CURL=YesPlease"
 	fi
 	# broken assumptions, because of broken build system ...
 	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
 	myopts+=" INSTALL=install TAR=tar"
 	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
 	myopts+=" SANE_TOOL_PATH="
 	myopts+=" OLD_ICONV="
 	myopts+=" NO_EXTERNAL_GREP="
 	# For svn-fe
 	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
 	# can't define this to null, since the entire makefile depends on it
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 	use iconv \
 		|| myopts+=" NO_ICONV=YesPlease"
 	use nls \
 		|| myopts+=" NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts+=" NO_TCLTK=YesPlease"
 	use pcre \
 		&& myopts+=" USE_LIBPCRE=yes" \
 		&& extlibs+=" -lpcre"
 	use perl \
 		&& myopts+=" INSTALLDIRS=vendor" \
 		|| myopts+=" NO_PERL=YesPlease"
 	use python \
 		|| myopts+=" NO_PYTHON=YesPlease"
 	use subversion \
 		|| myopts+=" NO_SVN_TESTS=YesPlease"
 	use threads \
 		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
 #		myopts+=" NO_IPV6=YesPlease"
 #		myopts+=" NO_STRLCPY=YesPlease"
 #		myopts+=" NO_MEMMEM=YesPlease"
 #		myopts+=" NO_MKDTEMP=YesPlease"
 #		myopts+=" NO_MKSTEMPS=YesPlease"
 #	fi
 	if [[ ${CHOST} == ia64-*-hpux* ]]; then
 		myopts+=" NO_NSEC=YesPlease"
 	fi
 	if [[ ${CHOST} == *-*-aix* ]]; then
 		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
 	fi
 	if [[ ${CHOST} == *-solaris* ]]; then
 		myopts+=" NEEDS_LIBICONV=YesPlease"
 	fi
 	has_version '>=app-text/asciidoc-8.0' \
 		&& myopts+=" ASCIIDOC8=YesPlease"
 	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
 	[[ "${CHOST}" == *-uclibc* ]] && \
 		myopts+=" NO_NSEC=YesPlease"
 	export MY_MAKEOPTS="${myopts}"
 	export EXTLIBS="${extlibs}"
 }
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		use doc && \
 			cd "${S}"/Documentation && \
 			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 	else
 		git-2_src_unpack
 		cd "${S}"
 		#cp "${FILESDIR}"/GIT-VERSION-GEN .
 	fi
 }
 src_prepare() {
 	# add experimental patches to improve mediawiki support
 	# see patches for origin
 	if use mediawiki-experimental ; then
 		PATCHES+=(
 			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
 			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
 			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
 		)
 	fi
 	default
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
 		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
 		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
 		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		Makefile contrib/svn-fe/Makefile || die "sed failed"
 	# Never install the private copy of Error.pm (bug #296310)
 	sed -i \
 		-e '/private-Error.pm/s,^,#,' \
 		perl/Makefile.PL
 	# Fix docbook2texi command
 	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
 		Documentation/Makefile || die "sed failed"
 	# Fix git-subtree missing DESTDIR
 	sed -i \
 		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
 		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
 		contrib/subtree/Makefile
 }
 git_emake() {
 	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
 	emake ${MY_MAKEOPTS} \
 		DESTDIR="${D}" \
 		OPTCFLAGS="${CFLAGS}" \
 		OPTLDFLAGS="${LDFLAGS}" \
 		OPTCC="$(tc-getCC)" \
 		OPTAR="$(tc-getAR)" \
 		prefix="${EPREFIX}"/usr \
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
 	# This is the fix for bug #326625, but it also causes breakage, see bug
 	# #352693.
 	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 src_configure() {
 	exportmakeopts
 }
 src_compile() {
 	if use perl ; then
 	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
 	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
 	fi
 	git_emake || die "emake failed"
 	if use emacs ; then
 		elisp-compile contrib/emacs/git{,-blame}.el
 	fi
 	if use perl && use cgi ; then
 		git_emake \
 			gitweb \
 			|| die "emake gitweb (cgi) failed"
 	fi
 	if [[ ${CHOST} == *-darwin* ]]; then
 		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
 		git_emake || die "emake credential-osxkeychain"
 	fi
 	cd "${S}"/Documentation
 	if [[ ${PV} == *9999 ]] ; then
 		git_emake man \
 			|| die "emake man failed"
 		if use doc ; then
 			git_emake info html \
 				|| die "emake info html failed"
 		fi
 	else
 		if use doc ; then
 			git_emake info \
 				|| die "emake info html failed"
 		fi
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		# by defining EXTLIBS we override the detection for libintl and
 		# libiconv, bug #516168
 		local nlsiconv=
 		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
 		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
 		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi
 		cd "${S}"
 	fi
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		git_emake || die "emake git-credential-gnome-keyring failed"
 	fi
 	cd "${S}"/contrib/subtree
 	git_emake
 	use doc && git_emake doc
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake
 	fi
 }
 src_install() {
 	git_emake \
 		install || \
 		die "make install failed"
 	if [[ ${CHOST} == *-darwin* ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
 	use doc && dodir /usr/share/doc/${PF}/html
 	for d in / /howto/ /technical/ ; do
 		docinto ${d}
 		dodoc Documentation${d}*.txt
 		if use doc ; then
 			docinto ${d}/html
 			dodoc Documentation${d}*.html
 		fi
 	done
 	docinto /
 	# Upstream does not ship this pre-built :-(
 	use doc && doinfo Documentation/{git,gitman}.info
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
 	# Not really a bash-completion file (bug #477920)
 	# but still needed uncompressed (bug #507480)
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 	if use emacs ; then
 		elisp-install ${PN} contrib/emacs/git.{el,elc}
 		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
 		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
 		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
 	exeinto /usr/libexec/git-core/
 	newexe contrib/git-resurrect.sh git-resurrect
 	# git-subtree
 	cd "${S}"/contrib/subtree
 	git_emake install || die "Failed to emake install git-subtree"
 	if use doc ; then
 		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
 	cd "${S}"
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake install
 		cd "${S}"
 	fi
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
 	# git-jump
 	exeinto /usr/libexec/git-core/
 	doexe contrib/git-jump/git-jump
 	newdoc contrib/git-jump/README git-jump.txt
 	# git-contacts
 	exeinto /usr/libexec/git-core/
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		dobin git-credential-gnome-keyring
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		dobin svn-fe
 		dodoc svn-fe.txt
 		if use doc ; then
 			doman svn-fe.1
 			docinto html
 			dodoc svn-fe.html
 		fi
 		cd "${S}"
 	fi
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
 	# p4import - excluded because fast-import has a better one
 	# patches - stuff the Git guys made to go upstream to other places
 	# persistent-https - TODO
 	# mw-to-git - TODO
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
 	for i in \
 		buildsystems convert-objects fast-import \
 		hg-to-git hooks remotes2config.sh rerere-train.sh \
 		stats workdir \
 		; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
 			|| die "Failed contrib ${i}"
 	done
 	if use perl && use cgi ; then
 		# We used to install in /usr/share/${PN}/gitweb
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
 		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
 		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
 		newdoc  "${S}"/gitweb/README README.gitweb
 		find "${ED}"/usr/lib64/perl5/ \
 			-name .packlist \
 			-exec rm \{\} \;
 	else
 		rm -rf "${ED}"/usr/share/gitweb
 	fi
 	if ! use subversion ; then
 		rm -f "${ED}"/usr/libexec/git-core/git-svn \
 			"${ED}"/usr/share/man/man1/git-svn.1*
 	fi
 	if use xinetd ; then
 		insinto /etc/xinetd.d
 		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
 	fi
 	if use !prefix ; then
 		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
 		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
 		systemd_dounit "${FILESDIR}/git-daemon.socket"
 	fi
 	perl_delete_localpod
 }
 src_test() {
 	local disabled="t8005-blame-i18n.sh" #520270
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
 					t9402-git-cvsserver-refs.sh \
 					t9600-cvsimport.sh \
 					t9601-cvsimport-vendor-branch.sh \
 					t9602-cvsimport-branches-tags.sh \
 					t9603-cvsimport-patchsets.sh \
 					t9604-cvsimport-timestamps.sh"
 	local tests_perl="t3701-add-interactive.sh \
 					t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh \
 					t7106-reset-unborn-branch.sh \
 					t7501-commit.sh"
 	# Bug #225601 - t0004 is not suitable for root perm
 	# Bug #219839 - t1004 is not suitable for root perm
 	# t0001-init.sh - check for init notices EPERM*  fails
 	local tests_nonroot="t0001-init.sh \
 		t0004-unwritable.sh \
 		t0070-fundamental.sh \
 		t1004-read-tree-m-u-wf.sh \
 		t3700-add.sh \
 		t7300-clean.sh"
 	# t9100 still fails with symlinks in SVN 1.7
 	local test_svn="t9100-git-svn-basic.sh"
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
 		disabled="${disabled} t5000-tar-tree.sh"
 	fi
 	cvs=0
 	use cvs && let cvs=$cvs+1
 	if [[ ${EUID} -eq 0 ]]; then
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
 			has_version "dev-vcs/cvs[server]" && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
 		disabled="${disabled} ${tests_perl}"
 	fi
 	einfo "Disabling tests that fail with SVN 1.7"
 	disabled="${disabled} ${test_svn}"
 	# Reset all previously disabled tests
 	cd "${S}/t"
 	for i in *.sh.DISABLED ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
 	done
 	einfo "Disabled tests:"
 	for i in ${disabled} ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
 	done
 	# Avoid the test system removing the results because we want them ourselves
 	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
 		-i "${S}"/t/Makefile
 	# Clean old results first, must always run
 	cd "${S}/t"
 	nonfatal git_emake clean
 	# Now run the tests, keep going if we hit an error, and don't terminate on
 	# failure
 	cd "${S}"
 	einfo "Start test run"
 	#MAKEOPTS=-j1
 	nonfatal git_emake --keep-going test
 	rc=$?
 	# Display nice results, now print the results
 	cd "${S}/t"
 	nonfatal git_emake aggregate-results
 	# And bail if there was a problem
 	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
 }
 showpkgdeps() {
 	local pkg=$1
 	shift
 	elog "  $(printf "%-17s:" ${pkg}) ${@}"
 }
 pkg_postinst() {
 	use emacs && elisp-site-regen
 	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
 	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
 	einfo "Note that the prompt bash code is now in that separate script"
 	elog "These additional scripts need some dependencies:"
 	echo
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-instaweb \
 		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
 pkg_postrm() {
 	use emacs && elisp-site-regen
 }
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.7.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.7.4.ebuild
@ -1,668 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python2_7 )
 [[ ${PV} == *9999 ]] && SCM="git-2"
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
 EGIT_MASTER=pu
 PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
 inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
 MY_PV="${PV/_rc/.rc}"
 MY_P="${PN}-${MY_PV}"
 DOC_VER=${MY_PV}
 DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
 HOMEPAGE="http://www.git-scm.com/"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
 	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
 	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
 	gnome-keyring? ( gnome-base/libgnome-keyring )"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
 	mediawiki? (
 		dev-perl/DateTime-Format-ISO8601
 		dev-perl/HTML-Tree
 		dev-perl/MediaWiki-API
 	)
 	perl? ( dev-perl/Error
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	python? ( gtk?
 	(
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
 #   .xml/docbook  --(docbook2texi.pl)--> .texi
 #   .texi         --(makeinfo)---------> .info
 DEPEND="${CDEPEND}
 	doc? (
 		app-text/asciidoc
 		app-text/docbook2X
 		sys-apps/texinfo
 		app-text/xmlto
 	)
 	nls? ( sys-devel/gettext )
 	test? (	app-crypt/gnupg	)"
 # Live ebuild builds man pages and HTML docs, additionally
 if [[ ${PV} == *9999 ]]; then
 	DEPEND="${DEPEND}
 		app-text/asciidoc"
 fi
 SITEFILE=50${PN}-gentoo.el
 S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	cgi? ( perl )
 	cvs? ( perl )
 	mediawiki? ( perl )
 	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
 	"${FILESDIR}"/git-2.2.2-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
 	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
 	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
 	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
 	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
 )
 pkg_setup() {
 	if use subversion && has_version "dev-vcs/subversion[dso]"; then
 		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
 		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
 		ewarn "have been warned."
 	fi
 	if use python ; then
 		python-single-r1_pkg_setup
 	fi
 }
 # This is needed because for some obscure reasons future calls to make don't
 # pick up these exports if we export them in src_unpack()
 exportmakeopts() {
 	local myopts
 	if use blksha1 ; then
 		myopts+=" BLK_SHA1=YesPlease"
 	elif use ppcsha1 ; then
 		myopts+=" PPC_SHA1=YesPlease"
 	fi
 	if use curl ; then
 		use webdav || myopts+=" NO_EXPAT=YesPlease"
 	else
 		myopts+=" NO_CURL=YesPlease"
 	fi
 	# broken assumptions, because of broken build system ...
 	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
 	myopts+=" INSTALL=install TAR=tar"
 	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
 	myopts+=" SANE_TOOL_PATH="
 	myopts+=" OLD_ICONV="
 	myopts+=" NO_EXTERNAL_GREP="
 	# For svn-fe
 	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
 	# can't define this to null, since the entire makefile depends on it
 	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
 	use iconv \
 		|| myopts+=" NO_ICONV=YesPlease"
 	use nls \
 		|| myopts+=" NO_GETTEXT=YesPlease"
 	use tk \
 		|| myopts+=" NO_TCLTK=YesPlease"
 	use pcre \
 		&& myopts+=" USE_LIBPCRE=yes" \
 		&& extlibs+=" -lpcre"
 	use perl \
 		&& myopts+=" INSTALLDIRS=vendor" \
 		|| myopts+=" NO_PERL=YesPlease"
 	use python \
 		|| myopts+=" NO_PYTHON=YesPlease"
 	use subversion \
 		|| myopts+=" NO_SVN_TESTS=YesPlease"
 	use threads \
 		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
 #		myopts+=" NO_IPV6=YesPlease"
 #		myopts+=" NO_STRLCPY=YesPlease"
 #		myopts+=" NO_MEMMEM=YesPlease"
 #		myopts+=" NO_MKDTEMP=YesPlease"
 #		myopts+=" NO_MKSTEMPS=YesPlease"
 #	fi
 	if [[ ${CHOST} == ia64-*-hpux* ]]; then
 		myopts+=" NO_NSEC=YesPlease"
 	fi
 	if [[ ${CHOST} == *-*-aix* ]]; then
 		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
 	fi
 	if [[ ${CHOST} == *-solaris* ]]; then
 		myopts+=" NEEDS_LIBICONV=YesPlease"
 	fi
 	has_version '>=app-text/asciidoc-8.0' \
 		&& myopts+=" ASCIIDOC8=YesPlease"
 	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
 	[[ "${CHOST}" == *-uclibc* ]] && \
 		myopts+=" NO_NSEC=YesPlease"
 	export MY_MAKEOPTS="${myopts}"
 	export EXTLIBS="${extlibs}"
 }
 src_unpack() {
 	if [[ ${PV} != *9999 ]]; then
 		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		use doc && \
 			cd "${S}"/Documentation && \
 			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 		cd "${S}"
 	else
 		git-2_src_unpack
 		cd "${S}"
 		#cp "${FILESDIR}"/GIT-VERSION-GEN .
 	fi
 }
 src_prepare() {
 	# add experimental patches to improve mediawiki support
 	# see patches for origin
 	if use mediawiki-experimental ; then
 		PATCHES+=(
 			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
 			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
 			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
 		)
 	fi
 	default
 	sed -i \
 		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
 		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
 		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
 		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
 		Makefile contrib/svn-fe/Makefile || die "sed failed"
 	# Never install the private copy of Error.pm (bug #296310)
 	sed -i \
 		-e '/private-Error.pm/s,^,#,' \
 		perl/Makefile.PL
 	# Fix docbook2texi command
 	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
 		Documentation/Makefile || die "sed failed"
 	# Fix git-subtree missing DESTDIR
 	sed -i \
 		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
 		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
 		contrib/subtree/Makefile
 }
 git_emake() {
 	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
 	emake ${MY_MAKEOPTS} \
 		DESTDIR="${D}" \
 		OPTCFLAGS="${CFLAGS}" \
 		OPTLDFLAGS="${LDFLAGS}" \
 		OPTCC="$(tc-getCC)" \
 		OPTAR="$(tc-getAR)" \
 		prefix="${EPREFIX}"/usr \
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
 	# This is the fix for bug #326625, but it also causes breakage, see bug
 	# #352693.
 	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 src_configure() {
 	exportmakeopts
 }
 src_compile() {
 	if use perl ; then
 	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
 	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
 	fi
 	git_emake || die "emake failed"
 	if use emacs ; then
 		elisp-compile contrib/emacs/git{,-blame}.el
 	fi
 	if use perl && use cgi ; then
 		git_emake \
 			gitweb \
 			|| die "emake gitweb (cgi) failed"
 	fi
 	if [[ ${CHOST} == *-darwin* ]]; then
 		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
 		git_emake || die "emake credential-osxkeychain"
 	fi
 	cd "${S}"/Documentation
 	if [[ ${PV} == *9999 ]] ; then
 		git_emake man \
 			|| die "emake man failed"
 		if use doc ; then
 			git_emake info html \
 				|| die "emake info html failed"
 		fi
 	else
 		if use doc ; then
 			git_emake info \
 				|| die "emake info html failed"
 		fi
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		# by defining EXTLIBS we override the detection for libintl and
 		# libiconv, bug #516168
 		local nlsiconv=
 		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
 		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
 		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
 		if use doc ; then
 			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
 		fi
 		cd "${S}"
 	fi
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		git_emake || die "emake git-credential-gnome-keyring failed"
 	fi
 	cd "${S}"/contrib/subtree
 	git_emake
 	use doc && git_emake doc
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake
 	fi
 }
 src_install() {
 	git_emake \
 		install || \
 		die "make install failed"
 	if [[ ${CHOST} == *-darwin* ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 	# Depending on the tarball and manual rebuild of the documentation, the
 	# manpages may exist in either OR both of these directories.
 	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
 	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
 	use doc && dodir /usr/share/doc/${PF}/html
 	for d in / /howto/ /technical/ ; do
 		docinto ${d}
 		dodoc Documentation${d}*.txt
 		if use doc ; then
 			docinto ${d}/html
 			dodoc Documentation${d}*.html
 		fi
 	done
 	docinto /
 	# Upstream does not ship this pre-built :-(
 	use doc && doinfo Documentation/{git,gitman}.info
 	newbashcomp contrib/completion/git-completion.bash ${PN}
 	bashcomp_alias git gitk
 	# Not really a bash-completion file (bug #477920)
 	# but still needed uncompressed (bug #507480)
 	insinto /usr/share/${PN}
 	doins contrib/completion/git-prompt.sh
 	if use emacs ; then
 		elisp-install ${PN} contrib/emacs/git.{el,elc}
 		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
 		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
 		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
 	exeinto /usr/libexec/git-core/
 	newexe contrib/git-resurrect.sh git-resurrect
 	# git-subtree
 	cd "${S}"/contrib/subtree
 	git_emake install || die "Failed to emake install git-subtree"
 	if use doc ; then
 		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
 	fi
 	newdoc README README.git-subtree
 	dodoc git-subtree.txt
 	cd "${S}"
 	if use mediawiki ; then
 		cd "${S}"/contrib/mw-to-git
 		git_emake install
 		cd "${S}"
 	fi
 	# diff-highlight
 	dobin contrib/diff-highlight/diff-highlight
 	newdoc contrib/diff-highlight/README README.diff-highlight
 	# git-jump
 	exeinto /usr/libexec/git-core/
 	doexe contrib/git-jump/git-jump
 	newdoc contrib/git-jump/README git-jump.txt
 	# git-contacts
 	exeinto /usr/libexec/git-core/
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
 	if use gnome-keyring ; then
 		cd "${S}"/contrib/credential/gnome-keyring
 		dobin git-credential-gnome-keyring
 	fi
 	if use subversion ; then
 		cd "${S}"/contrib/svn-fe
 		dobin svn-fe
 		dodoc svn-fe.txt
 		if use doc ; then
 			doman svn-fe.1
 			docinto html
 			dodoc svn-fe.html
 		fi
 		cd "${S}"
 	fi
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
 	# git-jump - done above
 	# gitview - installed above
 	# p4import - excluded because fast-import has a better one
 	# patches - stuff the Git guys made to go upstream to other places
 	# persistent-https - TODO
 	# mw-to-git - TODO
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
 	for i in \
 		buildsystems convert-objects fast-import \
 		hg-to-git hooks remotes2config.sh rerere-train.sh \
 		stats workdir \
 		; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
 			|| die "Failed contrib ${i}"
 	done
 	if use perl && use cgi ; then
 		# We used to install in /usr/share/${PN}/gitweb
 		# but upstream installs in /usr/share/gitweb
 		# so we will install a symlink and use their location for compat with other
 		# distros
 		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
 		# INSTALL discusses configuration issues, not just installation
 		docinto /
 		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
 		newdoc  "${S}"/gitweb/README README.gitweb
 		find "${ED}"/usr/lib64/perl5/ \
 			-name .packlist \
 			-exec rm \{\} \;
 	else
 		rm -rf "${ED}"/usr/share/gitweb
 	fi
 	if ! use subversion ; then
 		rm -f "${ED}"/usr/libexec/git-core/git-svn \
 			"${ED}"/usr/share/man/man1/git-svn.1*
 	fi
 	if use xinetd ; then
 		insinto /etc/xinetd.d
 		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
 	fi
 	if use !prefix ; then
 		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
 		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
 		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
 		systemd_dounit "${FILESDIR}/git-daemon.socket"
 	fi
 	perl_delete_localpod
 	# Remove disabled linguas
 	# we could remove sources in src_prepare, but install does not
 	# handle missing locale dir well
 	rm_loc() {
 		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
 	l10n_for_each_disabled_locale_do rm_loc
 }
 src_test() {
 	local disabled="t8005-blame-i18n.sh" #520270
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
 					t9402-git-cvsserver-refs.sh \
 					t9600-cvsimport.sh \
 					t9601-cvsimport-vendor-branch.sh \
 					t9602-cvsimport-branches-tags.sh \
 					t9603-cvsimport-patchsets.sh \
 					t9604-cvsimport-timestamps.sh"
 	local tests_perl="t3701-add-interactive.sh \
 					t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh \
 					t7106-reset-unborn-branch.sh \
 					t7501-commit.sh"
 	# Bug #225601 - t0004 is not suitable for root perm
 	# Bug #219839 - t1004 is not suitable for root perm
 	# t0001-init.sh - check for init notices EPERM*  fails
 	local tests_nonroot="t0001-init.sh \
 		t0004-unwritable.sh \
 		t0070-fundamental.sh \
 		t1004-read-tree-m-u-wf.sh \
 		t3700-add.sh \
 		t7300-clean.sh"
 	# t9100 still fails with symlinks in SVN 1.7
 	local test_svn="t9100-git-svn-basic.sh"
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
 		einfo "Disabling tar-tree tests"
 		disabled="${disabled} t5000-tar-tree.sh"
 	fi
 	cvs=0
 	use cvs && let cvs=$cvs+1
 	if [[ ${EUID} -eq 0 ]]; then
 		if [[ $cvs -eq 1 ]]; then
 			ewarn "Skipping CVS tests because CVS does not work as root!"
 			ewarn "You should retest with FEATURES=userpriv!"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 		einfo "Skipping other tests that require being non-root"
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
 			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
 			has_version "dev-vcs/cvs[server]" && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
 			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
 	if ! use perl ; then
 		einfo "Disabling tests that need Perl"
 		disabled="${disabled} ${tests_perl}"
 	fi
 	einfo "Disabling tests that fail with SVN 1.7"
 	disabled="${disabled} ${test_svn}"
 	# Reset all previously disabled tests
 	cd "${S}/t"
 	for i in *.sh.DISABLED ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
 	done
 	einfo "Disabled tests:"
 	for i in ${disabled} ; do
 		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
 	done
 	# Avoid the test system removing the results because we want them ourselves
 	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
 		-i "${S}"/t/Makefile
 	# Clean old results first, must always run
 	cd "${S}/t"
 	nonfatal git_emake clean
 	# Now run the tests, keep going if we hit an error, and don't terminate on
 	# failure
 	cd "${S}"
 	einfo "Start test run"
 	#MAKEOPTS=-j1
 	nonfatal git_emake --keep-going test
 	rc=$?
 	# Display nice results, now print the results
 	cd "${S}/t"
 	nonfatal git_emake aggregate-results
 	# And bail if there was a problem
 	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
 }
 showpkgdeps() {
 	local pkg=$1
 	shift
 	elog "  $(printf "%-17s:" ${pkg}) ${@}"
 }
 pkg_postinst() {
 	use emacs && elisp-site-regen
 	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
 	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
 	einfo "Note that the prompt bash code is now in that separate script"
 	elog "These additional scripts need some dependencies:"
 	echo
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-instaweb \
 		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
 	echo
 	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
 }
 pkg_postrm() {
 	use emacs && elisp-site-regen
 }
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
@ -38,17 +37,18 @@ if [[ ${PV} != *9999 ]]; then
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	libsecret? ( app-crypt/libsecret )
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
@ -58,7 +58,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
+"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
@ -74,12 +74,8 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	python? ( gtk?
+	python? ( ${PYTHON_DEPS} )
-	(
+"
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
@ -111,13 +107,12 @@ REQUIRED_USE="
 	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.10.0-optional-cvs.patch
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
@ -192,6 +187,8 @@ exportmakeopts() {
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 	use elibc_musl \
 		&& myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
@ -361,12 +358,12 @@ src_compile() {
 		cd "${S}"
 	fi
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-gnome-keyring failed"
+		git_emake || die "emake git-credential-libsecret failed"
 	fi
-	cd "${S}"/contrib/subtree
+	cd "${S}"/contrib/subtree || die
 	git_emake
 	use doc && git_emake doc
@ -420,11 +417,6 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@ -461,9 +453,9 @@ src_install() {
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-gnome-keyring
+		dobin git-credential-libsecret
 	fi
 	if use subversion ; then
@ -481,7 +473,6 @@ src_install() {
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
@ -494,11 +485,17 @@ src_install() {
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
+	local contrib_objects=(
-		buildsystems convert-objects fast-import \
+		buildsystems
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		fast-import
-		stats workdir \
+		hg-to-git
-		; do
+		hooks
 		remotes2config.sh
 		rerere-train.sh
 		stats
 		workdir
 	)
 	for i in "${contrib_objects[@]}" ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
@ -555,7 +552,7 @@ src_install() {
 }
 src_test() {
-	local disabled=""
+	local disabled="t9128-git-svn-cmd-branch.sh"
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
@ -38,17 +37,18 @@ if [[ ${PV} != *9999 ]]; then
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	libsecret? ( app-crypt/libsecret )
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
@ -58,7 +58,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
+"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
@ -74,12 +74,8 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	python? ( gtk?
+	python? ( ${PYTHON_DEPS} )
-	(
+"
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
@ -111,13 +107,12 @@ REQUIRED_USE="
 	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.10.0-optional-cvs.patch
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
@ -192,6 +187,8 @@ exportmakeopts() {
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 	use elibc_musl \
 		&& myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
@ -361,12 +358,12 @@ src_compile() {
 		cd "${S}"
 	fi
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-gnome-keyring failed"
+		git_emake || die "emake git-credential-libsecret failed"
 	fi
-	cd "${S}"/contrib/subtree
+	cd "${S}"/contrib/subtree || die
 	git_emake
 	use doc && git_emake doc
@ -420,11 +417,6 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@ -461,9 +453,9 @@ src_install() {
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-gnome-keyring
+		dobin git-credential-libsecret
 	fi
 	if use subversion ; then
@ -481,7 +473,6 @@ src_install() {
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
@ -494,11 +485,17 @@ src_install() {
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
+	local contrib_objects=(
-		buildsystems convert-objects fast-import \
+		buildsystems
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		fast-import
-		stats workdir \
+		hg-to-git
-		; do
+		hooks
 		remotes2config.sh
 		rerere-train.sh
 		stats
 		workdir
 	)
 	for i in "${contrib_objects[@]}" ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
@ -555,7 +552,7 @@ src_install() {
 }
 src_test() {
-	local disabled=""
+	local disabled="t9128-git-svn-cmd-branch.sh"
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
@ -38,17 +37,18 @@ if [[ ${PV} != *9999 ]]; then
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	libsecret? ( app-crypt/libsecret )
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
@ -58,7 +58,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
+"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
@ -74,12 +74,8 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	python? ( gtk?
+	python? ( ${PYTHON_DEPS} )
-	(
+"
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
@ -111,13 +107,12 @@ REQUIRED_USE="
 	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.10.0-optional-cvs.patch
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
@ -192,6 +187,8 @@ exportmakeopts() {
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 	use elibc_musl \
 		&& myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
@ -361,12 +358,12 @@ src_compile() {
 		cd "${S}"
 	fi
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-gnome-keyring failed"
+		git_emake || die "emake git-credential-libsecret failed"
 	fi
-	cd "${S}"/contrib/subtree
+	cd "${S}"/contrib/subtree || die
 	git_emake
 	use doc && git_emake doc
@ -420,11 +417,6 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@ -461,9 +453,9 @@ src_install() {
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-gnome-keyring
+		dobin git-credential-libsecret
 	fi
 	if use subversion ; then
@ -481,7 +473,6 @@ src_install() {
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
@ -494,11 +485,17 @@ src_install() {
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
+	local contrib_objects=(
-		buildsystems convert-objects fast-import \
+		buildsystems
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		fast-import
-		stats workdir \
+		hg-to-git
-		; do
+		hooks
 		remotes2config.sh
 		rerere-train.sh
 		stats
 		workdir
 	)
 	for i in "${contrib_objects[@]}" ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
@ -555,7 +552,7 @@ src_install() {
 }
 src_test() {
-	local disabled=""
+	local disabled="t9128-git-svn-cmd-branch.sh"
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild
@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
@ -38,17 +37,18 @@ if [[ ${PV} != *9999 ]]; then
 			doc? (
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
 # Common to both DEPEND and RDEPEND
 CDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	libsecret? ( app-crypt/libsecret )
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
@ -58,7 +58,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
+"
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
@ -74,12 +74,8 @@ RDEPEND="${CDEPEND}
 			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
-	python? ( gtk?
+	python? ( ${PYTHON_DEPS} )
-	(
+"
 		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
 		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
 	)
 		${PYTHON_DEPS} )"
 # This is how info docs are created with Git:
 #   .txt/asciidoc --(asciidoc)---------> .xml/docbook
@ -111,13 +107,12 @@ REQUIRED_USE="
 	mediawiki-experimental? ( mediawiki )
 	subversion? ( perl )
 	webdav? ( curl )
 	gtk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 PATCHES=(
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.10.0-optional-cvs.patch
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution
@ -192,6 +187,8 @@ exportmakeopts() {
 		|| myopts+=" NO_PTHREADS=YesPlease"
 	use cvs \
 		|| myopts+=" NO_CVS=YesPlease"
 	use elibc_musl \
 		&& myopts+=" NO_REGEX=YesPlease"
 # Disabled until ~m68k-mint can be keyworded again
 #	if [[ ${CHOST} == *-mint* ]] ; then
 #		myopts+=" NO_MMAP=YesPlease"
@ -361,12 +358,12 @@ src_compile() {
 		cd "${S}"
 	fi
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-gnome-keyring failed"
+		git_emake || die "emake git-credential-libsecret failed"
 	fi
-	cd "${S}"/contrib/subtree
+	cd "${S}"/contrib/subtree || die
 	git_emake
 	use doc && git_emake doc
@ -420,11 +417,6 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 	if use python && use gtk ; then
 		python_doscript "${S}"/contrib/gitview/gitview
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 	#dobin contrib/fast-import/git-p4 # Moved upstream
 	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
@ -461,9 +453,9 @@ src_install() {
 	doexe contrib/contacts/git-contacts
 	dodoc contrib/contacts/git-contacts.txt
-	if use gnome-keyring ; then
+	if use libsecret ; then
-		cd "${S}"/contrib/credential/gnome-keyring
+		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-gnome-keyring
+		dobin git-credential-libsecret
 	fi
 	if use subversion ; then
@ -481,7 +473,6 @@ src_install() {
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# completion - installed above
 	# credential/gnome-keyring TODO
 	# diff-highlight - done above
 	# emacs - installed above
 	# examples - these are stuff that is not used in Git anymore actually
@ -494,11 +485,17 @@ src_install() {
 	# subtree - build  seperately
 	# svnimport - use git-svn
 	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
+	local contrib_objects=(
-		buildsystems convert-objects fast-import \
+		buildsystems
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		fast-import
-		stats workdir \
+		hg-to-git
-		; do
+		hooks
 		remotes2config.sh
 		rerere-train.sh
 		stats
 		workdir
 	)
 	for i in "${contrib_objects[@]}" ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${ED}"/usr/share/${PN}/contrib \
@ -555,7 +552,7 @@ src_install() {
 }
 src_test() {
-	local disabled=""
+	local disabled="t9128-git-svn-cmd-branch.sh"
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
 					t9401-git-cvsserver-crlf.sh \
--- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/metadata.xml
@ -30,6 +30,7 @@
    <flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag>
    <flag name="gtk">Include the gitview contrib tool</flag>
    <flag name="highlight">GitWeb support for app-text/highlight</flag>
    <flag name="libsecret">Enable libsecret support to store login credentials</flag>
    <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
    <flag name="mediawiki-experimental">Add experimental patches for improved MediaWiki support</flag>
    <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.10.1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.10.1
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.10.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.10.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.10.1.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=89f569e1263f92cd6362bac9fe7e9d30
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.10.2
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.10.2
@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.10.2.tar.xz mirror://kernel/software/scm/git/git-manpages-2.10.2.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.10.2.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=89f569e1263f92cd6362bac9fe7e9d30
+_md5_=740eb95129100ff5fdf7b8bf663df126
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.11.0_rc2
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.11.0_rc2
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/testing/git-2.11.0.rc2.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.11.0.rc2.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.11.0.rc2.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=86387c8e3b14bd9da926ed48be4f2c68
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.11.1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.11.1
@ -4,11 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.9.3.tar.xz mirror://kernel/software/scm/git/git-manpages-2.9.3.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.9.3.tar.xz )
+SRC_URI=mirror://kernel/software/scm/git/git-2.11.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.11.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.11.1.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=8677acbe34d221c94283f6020581cd7e
+_md5_=b6f2e7b79b3a3e8729d96bdd0bf0b4ac
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.12.1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.12.1
@ -0,0 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.12.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.12.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.12.1.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=4b1944c4a885e96a5337a5cc82d4169a
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.12.2
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.12.2
@ -0,0 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.12.2.tar.xz mirror://kernel/software/scm/git/git-manpages-2.12.2.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.12.2.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=4b1944c4a885e96a5337a5cc82d4169a
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.4.11
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.4.11
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.4.11.tar.xz mirror://kernel/software/scm/git/git-manpages-2.4.11.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.4.11.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
 _md5_=1d10d4f5ed88a3f007ab4735e583c128
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.5.5
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.5.5
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.5.5.tar.xz mirror://kernel/software/scm/git/git-manpages-2.5.5.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.5.5.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
 _md5_=18f4cdadc850fa922b22eb851b4ec19b
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.6.6
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.6.6
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.6.6.tar.xz mirror://kernel/software/scm/git/git-manpages-2.6.6.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.6.6.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
 _md5_=18f4cdadc850fa922b22eb851b4ec19b
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.7.3-r1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.7.3-r1
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.7.3.tar.xz mirror://kernel/software/scm/git/git-manpages-2.7.3.tar.xz https://dev.gentoo.org/~robbat2/distfiles/git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.7.3.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=e8c1090a478ce771c2c9329733feeff3
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.7.4
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.7.4
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.7.4.tar.xz mirror://kernel/software/scm/git/git-manpages-2.7.4.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.7.4.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=66c6eee887a5ec4279e93df66954a4bb
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.8.4
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.8.4
@ -1,14 +0,0 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.8.4.tar.xz mirror://kernel/software/scm/git/git-manpages-2.8.4.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.8.4.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=8677acbe34d221c94283f6020581cd7e
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
+IUSE=+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	git-r3	6efc2d7de07a77bf72c7207b48d0e123	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=86387c8e3b14bd9da926ed48be4f2c68
+_md5_=eee08a77837499bf457d28805bb0ce2e
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r1
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
+IUSE=+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	git-r3	6efc2d7de07a77bf72c7207b48d0e123	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=07ed2f8405ca0af8a0df59641d6241a4
+_md5_=24d059046e947f99616e19128d94d39f
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r2
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
+IUSE=+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	git-r3	6efc2d7de07a77bf72c7207b48d0e123	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d79b57521d85714aaa4d31214030413c
+_md5_=fe6a6efb180e8b61be65816d8e34de4e
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r3
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=6
 HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
+IUSE=+blksha1 +curl cgi doc emacs +gpg highlight +iconv libressl libsecret mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) libsecret? ( app-crypt/libsecret ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	git-r3	6efc2d7de07a77bf72c7207b48d0e123	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4f7cb8f4786e25f4bec2c63132a17646
+_md5_=f4bac57c925c288b381e54678fcbfd78
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-478
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-478
@ -1,13 +0,0 @@
 DEFINED_PHASES=configure install postinst prepare unpack
 DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre )
 DESCRIPTION=Excellent text file viewer
 EAPI=4
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-478.tar.gz http://www-zeuthen.desy.de/~friebel/unix/less/code2color -> code2color-0.2
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=54ae614f1536775da3eed12777338d33
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-479
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-479
@ -1,13 +0,0 @@
 DEFINED_PHASES=configure install postinst prepare unpack
 DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre )
 DESCRIPTION=Excellent text file viewer
 EAPI=4
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2 pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-479.tar.gz http://www-zeuthen.desy.de/~friebel/unix/less/code2color -> code2color-0.2
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=ce7dca82f559f9736d878414a904a703
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-481
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-481
@ -1,13 +0,0 @@
 DEFINED_PHASES=configure install postinst prepare unpack
 DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 DESCRIPTION=Excellent text file viewer
 EAPI=5
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-481.tar.gz http://www-zeuthen.desy.de/~friebel/unix/less/code2color -> code2color-0.2
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=7ee042013f200dcc2a95970e653b1bbe
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-487
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-487
@ -0,0 +1,12 @@
 DEFINED_PHASES=configure install preinst prepare
 DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 DESCRIPTION=Excellent text file viewer
 EAPI=5
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-487.tar.gz
 _md5_=f7286d17f7aa46c2f61f89530dee8d6c
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-488
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-488
@ -0,0 +1,12 @@
 DEFINED_PHASES=configure install preinst prepare
 DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 DESCRIPTION=Excellent text file viewer
 EAPI=5
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-488.tar.gz
 _md5_=e9db4513de1d1e344ed16693f509e050
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-491
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-apps/less-491
@ -0,0 +1,12 @@
 DEFINED_PHASES=configure install preinst prepare
 DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 DESCRIPTION=Excellent text file viewer
 EAPI=5
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-491.tar.gz
 _md5_=e9db4513de1d1e344ed16693f509e050
--- a/sdk_container/src/third_party/portage-stable/sys-apps/less/ChangeLog
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/ChangeLog
@ -1,747 +0,0 @@
 # ChangeLog for sys-apps/less
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.205 2015/07/23 09:35:09 ago Exp $
  23 Jul 2015; Agostino Sarubbo <ago@gentoo.org> less-478.ebuild:
  Stable for sparc, wrt bug #553692
  23 Jul 2015; Agostino Sarubbo <ago@gentoo.org> less-478.ebuild:
  Stable for ppc, wrt bug #553692
  14 Jul 2015; Tobias Klausmann <klausman@gentoo.org> less-478.ebuild:
  Stable on alpha, bug 553692
  09 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> less-478.ebuild:
  arm stable wrt bug #553692
  07 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> less-478.ebuild:
  x86 stable wrt bug #553692
  07 Jul 2015; Jeroen Roovers <jer@gentoo.org> less-478.ebuild:
  Stable for HPPA PPC64 (bug #553692).
 *less-479 (07 Jul 2015)
  07 Jul 2015; Mike Frysinger <vapier@gentoo.org> +less-479.ebuild:
  Version bump.
  07 Jul 2015; Mike Frysinger <vapier@gentoo.org> less-478.ebuild:
  Mark arm64/ia64/m68k/s390/sh stable #553692.
  06 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> less-478.ebuild:
  amd64 stable wrt bug #553692
 *less-478 (27 May 2015)
  27 May 2015; Lars Wendler <polynomial-c@gentoo.org> +less-478.ebuild:
  Version bump.
 *less-477 (23 May 2015)
  23 May 2015; Lars Wendler <polynomial-c@gentoo.org> -less-475.ebuild,
  +less-477.ebuild:
  Version bump. Removed old.
 *less-476 (11 May 2015)
  11 May 2015; Lars Wendler <polynomial-c@gentoo.org> -less-474.ebuild,
  +less-476.ebuild:
  Version bump. Removed old.
 *less-475 (10 Mar 2015)
  10 Mar 2015; Lars Wendler <polynomial-c@gentoo.org> -less-471.ebuild,
  +less-475.ebuild:
  Version bump. Removed old.
 *less-474 (07 Feb 2015)
  07 Feb 2015; Lars Wendler <polynomial-c@gentoo.org> -less-470.ebuild,
  +less-474.ebuild:
  Version bump. Removed old.
 *less-471 (15 Dec 2014)
  15 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -less-468.ebuild,
  +less-471.ebuild:
  Version bump. Removed old.
 *less-470 (06 Oct 2014)
  06 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> -less-466.ebuild,
  +less-470.ebuild:
  Version bump. Removed old.
 *less-468 (22 Sep 2014)
  22 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> -less-436.ebuild,
  -less-441.ebuild, -less-444.ebuild, -less-451.ebuild, -less-457.ebuild,
  -less-462.ebuild, +less-468.ebuild, -files/code2color.patch:
  Version bump. Removed old.
  11 Sep 2014; Mike Frysinger <vapier@gentoo.org> less-458.ebuild:
  Mark stable for all #521952.
  07 Sep 2014; Agostino Sarubbo <ago@gentoo.org> less-458.ebuild:
  Stable for ppc, wrt bug #521952
  04 Sep 2014; Jeroen Roovers <jer@gentoo.org> less-458.ebuild:
  Stable for HPPA (bug #521952).
  03 Sep 2014; Mikle Kolyada <zlogene@gentoo.org> less-458.ebuild:
  amd64 stable wrt bug #521952
 *less-466 (02 Sep 2014)
  02 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> -less-443.ebuild,
  -less-445.ebuild, -less-445-r1.ebuild, -less-449.ebuild, -less-450.ebuild,
  -less-456.ebuild, -less-459.ebuild, -less-460.ebuild, +less-466.ebuild:
  Version bump. Removed old.
  25 Aug 2014; Mike Gilbert <floppym@gentoo.org> files/less.envd:
  Revert SYSTEMD_LESS; systemd has a better default hard-coded.
  12 Feb 2014; Jason A. Donenfeld <zx2c4@gentoo.org> files/less.envd:
  Prepare for next systemd release.
  18 Jan 2014; Mike Frysinger <vapier@gentoo.org> less-457.ebuild,
  less-458.ebuild, less-459.ebuild, less-460.ebuild, less-462.ebuild:
  Add arm64 love.
  31 Dec 2013; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Fallback to rpm2tar when rpm is not available
 *less-462 (17 Dec 2013)
  17 Dec 2013; Tim Harder <radhermit@gentoo.org> +less-462.ebuild:
  Version bump.
  05 Sep 2013; Mike Frysinger <vapier@gentoo.org> less-457.ebuild:
  Mark m68k stable #450608.
  06 Aug 2013; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Handle csr/crt files with openssl.
 *less-460 (09 Jul 2013)
  09 Jul 2013; Tim Harder <radhermit@gentoo.org> +less-460.ebuild:
  Version bump.
 *less-459 (28 May 2013)
  28 May 2013; Mike Frysinger <vapier@gentoo.org> +less-459.ebuild:
  Version bump #471400 by Agostino Sarubbo.
  11 May 2013; Markos Chandras <hwoarang@gentoo.org> less-436.ebuild,
  less-441.ebuild, less-443.ebuild, less-444.ebuild, less-445-r1.ebuild,
  less-445.ebuild, less-449.ebuild, less-450.ebuild, less-451.ebuild,
  less-456.ebuild, less-457.ebuild, less-458.ebuild:
  Replace einfo messages with elog. Bug #448268
  29 Apr 2013; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Add webm/webp formats.
 *less-458 (04 Apr 2013)
  04 Apr 2013; Mike Frysinger <vapier@gentoo.org> +less-458.ebuild:
  Version bump.
  24 Mar 2013; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Add lzo support, and xz compressed man pages.
  24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> less-457.ebuild:
  Stable for sh, wrt bug #450608
  21 Feb 2013; Zac Medico <zmedico@gentoo.org> less-457.ebuild:
  Add ~arm-linux keyword.
  20 Feb 2013; Agostino Sarubbo <ago@gentoo.org> less-457.ebuild:
  Stable for s390, wrt bug #450608
  22 Jan 2013; Agostino Sarubbo <ago@gentoo.org> less-457.ebuild:
  Stable for alpha/amd64/ia64/ppc/ppc64/sparc/x86, wrt bug #450608
  17 Jan 2013; Jeroen Roovers <jer@gentoo.org> less-457.ebuild:
  Stable for HPPA (bug #450608).
  15 Jan 2013; Markus Meier <maekke@gentoo.org> less-457.ebuild:
  arm stable, bug #450608
 *less-457 (10 Dec 2012)
  10 Dec 2012; Mike Frysinger <vapier@gentoo.org> +less-457.ebuild:
  Version bump.
  22 Nov 2012; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Pass the -d flag to lzip for .lz files #444122 by Vincent Tai.
 *less-456 (09 Nov 2012)
  09 Nov 2012; Mike Frysinger <vapier@gentoo.org> +less-456.ebuild,
  -less-452.ebuild:
  Version bump to fix -Pm handling #439422 by Nikolaj Sjujskij.
 *less-452 (23 Oct 2012)
  23 Oct 2012; Tim Harder <radhermit@gentoo.org> +less-452.ebuild:
  Version bump.
  09 Sep 2012; Raúl Porcel <armin76@gentoo.org> less-451.ebuild:
  alpha/ia64/m68k/s390/sh/sparc stable wrt #431956
  04 Sep 2012; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Use the --wide flag when calling readelf to avoid truncating long symbol names
  #433637 by Raphaël Droz.
  21 Aug 2012; Anthony G. Basile <blueness@gentoo.org> less-451.ebuild:
  Stable arm, bug #431956
  20 Aug 2012; Anthony G. Basile <blueness@gentoo.org> less-451.ebuild:
  Stable ppc ppc64, bug #431956
  20 Aug 2012; Johannes Huber <johu@gentoo.org> less-451.ebuild:
  Stable for x86, wrt bug #431956
  20 Aug 2012; Agostino Sarubbo <ago@gentoo.org> less-451.ebuild:
  Stable for amd64, wrt bug #431956
  20 Aug 2012; Jeroen Roovers <jer@gentoo.org> less-451.ebuild:
  Stable for HPPA (bug #431956).
 *less-451 (22 Jul 2012)
  22 Jul 2012; Mike Frysinger <vapier@gentoo.org> +less-451.ebuild:
  Version bump.
 *less-450 (16 Jul 2012)
  16 Jul 2012; Tim Harder <radhermit@gentoo.org> +less-450.ebuild:
  Version bump.
 *less-449 (27 Jun 2012)
  27 Jun 2012; Mike Frysinger <vapier@gentoo.org> +less-449.ebuild:
  Version bump.
  04 Jun 2012; Fabian Groffen <grobian@gentoo.org> less-445-r1.ebuild:
  Fix for Prefix, add Prefix keywords, bug #388209
  26 Apr 2012; Alexis Ballier <aballier@gentoo.org> less-445-r1.ebuild:
  keyword ~amd64-fbsd
  31 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> less-444.ebuild:
  ppc64 stable wrt #389995
  04 Jan 2012; Brent Baude <ranger@gentoo.org> less-444.ebuild:
  Marking less-444 ppc for bug 389995
  07 Dec 2011; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Also check for `7zr` when processing 7z archives.
  03 Dec 2011; Raúl Porcel <armin76@gentoo.org> less-444.ebuild:
  alpha/ia64/m68k/s390/sh/sparc stable wrt #389995
  17 Nov 2011; Ulrich Mueller <ulm@gentoo.org> less-445-r1.ebuild:
  Fix dependency on app-misc/editor-wrapper.
  13 Nov 2011; Markus Meier <maekke@gentoo.org> less-444.ebuild:
  arm stable, bug #389995
  11 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> less-444.ebuild:
  x86 stable wrt bug #389995
  10 Nov 2011; Jeroen Roovers <jer@gentoo.org> less-444.ebuild:
  Stable for HPPA (bug #389995).
  10 Nov 2011; Tony Vroon <chainsaw@gentoo.org> less-444.ebuild:
  Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo &
  Elijah "Armageddon" El Lazkani in bug #389995.
 *less-445-r1 (09 Nov 2011)
  09 Nov 2011; Mike Frysinger <vapier@gentoo.org> +less-445-r1.ebuild:
  Update to EAPI=2, add editor-wrapper support, and USE=pcre support #389935.
 *less-445 (28 Oct 2011)
  28 Oct 2011; Tim Harder <radhermit@gentoo.org> +less-445.ebuild:
  Version bump.
  09 Oct 2011; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Only run cd-info when the .cue file exists #285507 by Martin von Gagern.
 *less-444 (09 Jun 2011)
  09 Jun 2011; Mike Frysinger <vapier@gentoo.org> +less-444.ebuild,
  files/less.envd:
  Version bump.
  01 May 2011; Kacper Kowalik <xarthisius@gentoo.org> less-441.ebuild:
  ppc64 stable wrt #363145
  23 Apr 2011; Raúl Porcel <armin76@gentoo.org> less-441.ebuild:
  alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #363145
  16 Apr 2011; nixnut <nixnut@gentoo.org> less-441.ebuild:
  ppc stable #363145
  15 Apr 2011; Christoph Mende <angelos@gentoo.org> less-441.ebuild:
  Stable on amd64 wrt bug #363145
  13 Apr 2011; Thomas Kahle <tomka@gentoo.org> less-441.ebuild:
  x86 stable per bug 363145
  11 Apr 2011; Jeroen Roovers <jer@gentoo.org> less-441.ebuild:
  Stable for HPPA (bug #363145).
 *less-443 (11 Apr 2011)
  11 Apr 2011; Mike Frysinger <vapier@gentoo.org> +less-443.ebuild:
  Version bump.
 *less-441 (28 Feb 2011)
  28 Feb 2011; Mike Frysinger <vapier@gentoo.org> +less-441.ebuild:
  Version bump.
 *less-440 (06 Jan 2011)
  06 Jan 2011; Mike Frysinger <vapier@gentoo.org> +less-440.ebuild:
  Version bump.
 *less-438 (31 Dec 2010)
  31 Dec 2010; Mike Frysinger <vapier@gentoo.org> +less-438.ebuild:
  Version bump.
  24 Aug 2010; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Add support for txz archives by Marcin Baczyński #334027.
  23 Mar 2010; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Fix by Jack Lloyd to handle .tbz and .tar.bz files #308855.
  14 Feb 2010; Mike Frysinger <vapier@gentoo.org> less-436.ebuild,
  files/lesspipe.sh:
  Rework lesspipe to fallback to the coloring tool rather than maintaining a
  list of matches #304359 by Dror Levin. Start renaming lesspipe.sh to
  lesspipe to better match other distros. Tip people to run `lesspipe -h`
  for color info #274457 by Jaak Ristioja.
  05 Feb 2010; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Fix handling of short tarball names #303433 by Mike Williams, and add a
  LESSDEBUG helper.
  10 Jan 2010; Ulrich Mueller <ulm@gentoo.org> less-436.ebuild:
  Fix LICENSE, less is the same as BSD-2.
  07 Oct 2009; Raúl Porcel <armin76@gentoo.org> less-436.ebuild:
  ia64/m68k/s390/sh stable wrt #284566
  30 Sep 2009; Tobias Klausmann <klausman@gentoo.org> less-436.ebuild:
  Stable on alpha, bug #284566
  25 Sep 2009; Brent Baude <ranger@gentoo.org> less-436.ebuild:
  Marking less-436 ppc64 for bug 284566
  22 Sep 2009; Tiago Cunha <tcunha@gentoo.org> less-436.ebuild:
  stable sparc, bug 284566
  19 Sep 2009; nixnut <nixnut@gentoo.org> less-436.ebuild:
  ppc stable #284566
  15 Sep 2009; Jeroen Roovers <jer@gentoo.org> less-436.ebuild:
  Stable for HPPA (bug #284566).
  13 Sep 2009; Markus Meier <maekke@gentoo.org> less-436.ebuild:
  arm/x86 stable, bug #284566
  12 Sep 2009; Richard Freeman <rich0@gentoo.org> less-436.ebuild:
  amd64 stable - 284566
 *less-436 (22 Jul 2009)
  22 Jul 2009; Mike Frysinger <vapier@gentoo.org> +less-436.ebuild:
  Version bump #274053 by Klaus Kusche.
  15 Jul 2009; nixnut <nixnut@gentoo.org> less-429.ebuild:
  ppc stable #273794
  19 Jun 2009; Brent Baude <ranger@gentoo.org> less-429.ebuild:
  stable ppc64, bug 273794
  17 Jun 2009; Thomas Anderson <gentoofan23@gentoo.org> less-429.ebuild:
  stable amd64, bug 273794
  16 Jun 2009; Raúl Porcel <armin76@gentoo.org> less-429.ebuild:
  alpha/arm/ia64/m68k/s390/sh stable wrt #273794
  12 Jun 2009; Jeroen Roovers <jer@gentoo.org> less-429.ebuild:
  Stable for HPPA (bug #273794).
  12 Jun 2009; Christian Faulhammer <fauli@gentoo.org> less-429.ebuild:
  stable x86, bug 273794
  12 Jun 2009; Ferris McCormick <fmccor@gentoo.org> less-429.ebuild:
  Sparc stable, Bug #273794.
 *less-429 (11 Apr 2009)
  11 Apr 2009; Mike Frysinger <vapier@gentoo.org> +less-429.ebuild:
  Version bump.
 *less-424 (09 Feb 2009)
  09 Feb 2009; Mike Frysinger <vapier@gentoo.org> +less-424.ebuild:
  Version bump.
  02 Feb 2009; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Add support for .lz/.xz and unify more places with ${DECOMPRESSOR}.
  21 Mar 2008; Christian Faulhammer <opfer@gentoo.org> less-416.ebuild,
  less-418.ebuild:
  PROVIDE for virtual/pager not needed anymore, there is a new-style virtual
  in the tree now
  16 Mar 2008; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Add case for shell scripts for file output #213565 by Matthias B.
  21 Feb 2008; Brent Baude <ranger@gentoo.org> less-418.ebuild:
  stable ppc64, bug 210725
  19 Feb 2008; Christoph Mende <angelos@gentoo.org> less-418.ebuild:
  Stable on amd64, bug #210725
  19 Feb 2008; nixnut <nixnut@gentoo.org> less-418.ebuild:
  Stable on ppc wrt bug 210735
  07 Feb 2008; Raúl Porcel <armin76@gentoo.org> less-418.ebuild:
  alpha/ia64/sparc/x86 stable
  05 Feb 2008; Markus Rothe <corsair@gentoo.org> less-416.ebuild:
  Stable on ppc64
  04 Feb 2008; Jeroen Roovers <jer@gentoo.org> less-418.ebuild:
  Stable for HPPA too.
  04 Feb 2008; Jeroen Roovers <jer@gentoo.org> less-416.ebuild:
  Stable for HPPA too.
  28 Jan 2008; Raúl Porcel <armin76@gentoo.org> less-418.ebuild:
  418 is GPL-3
 *less-418 (03 Jan 2008)
  03 Jan 2008; Mike Frysinger <vapier@gentoo.org> +less-418.ebuild:
  Version bump.
  30 Dec 2007; Richard Freeman <rich0@gentoo.org> less-416.ebuild:
  amd64 stable
  28 Dec 2007; Raúl Porcel <armin76@gentoo.org> less-416.ebuild:
  alpha/ia64/sparc/x86 stable
 *less-416 (28 Nov 2007)
  28 Nov 2007; Mike Frysinger <vapier@gentoo.org> +less-416.ebuild:
  Version bump.
  26 Nov 2007; Brent Baude <ranger@gentoo.org> less-409.ebuild:
  Marking less-409 ppc for bug 200348
  26 Nov 2007; Christoph Mende <angelos@gentoo.org> less-409.ebuild:
  Stable on amd64 wrt bug #200348
  26 Nov 2007; Jeroen Roovers <jer@gentoo.org> less-409.ebuild:
  Stable for HPPA (bug #200348).
  26 Nov 2007; Markus Rothe <corsair@gentoo.org> less-409.ebuild:
  Stable on ppc64; bug #200348
  17 Nov 2007; Raúl Porcel <armin76@gentoo.org> less-409.ebuild:
  alpha/ia64/sparc/x86 stable
 *less-415 (16 Nov 2007)
  16 Nov 2007; Mike Frysinger <vapier@gentoo.org> +less-415.ebuild:
  Version bump.
 *less-409 (12 Oct 2007)
  12 Oct 2007; Mike Frysinger <vapier@gentoo.org> +less-409.ebuild:
  Version bump.
 *less-408 (06 Oct 2007)
  06 Oct 2007; Mike Frysinger <vapier@gentoo.org> +less-408.ebuild:
  Version bump.
  28 Sep 2007; Jeroen Roovers <jer@gentoo.org> less-406.ebuild:
  Stable for HPPA (bug #194012).
  28 Sep 2007; Joshua Kinard <kumba@gentoo.org> less-406.ebuild:
  Stable on mips, per #194012.
  01 Sep 2007; Christoph Mende <angelos@gentoo.org> less-406.ebuild:
  Stable on amd64
  25 Aug 2007; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Disable colorization by default #188835.
  13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> less-406.ebuild:
  ppc. stable
  12 Aug 2007; Tom Gall <tgall@gentoo.org> less-406.ebuild:
  stable on ppc64
  02 Aug 2007; Christian Birchinger <joker@gentoo.org> less-406.ebuild:
  Added sparc stable keyword
  01 Aug 2007; Raúl Porcel <armin76@gentoo.org> less-406.ebuild:
  alpha/ia64/x86 stable
 *less-406 (28 Jun 2007)
  28 Jun 2007; Mike Frysinger <vapier@gentoo.org> +less-406.ebuild:
  Version bump.
 *less-403 (13 Jun 2007)
  13 Jun 2007; Mike Frysinger <vapier@gentoo.org> +files/less.envd,
  less-394.ebuild, +less-403.ebuild:
  Version bump #181912 by Raul Porcel and move LESSOPEN to our env.d from
  baselayout #180880 by Harald van Dijk.
  17 Oct 2006; Roy Marples <uberlord@gentoo.org> less-394.ebuild:
  Added ~sparc-fbsd keyword.
  24 May 2006; Christel Dahlskjaer <christel@gentoo.org> less-394.ebuild:
  Stable on mips; bug #133163
  14 May 2006; Markus Rothe <corsair@gentoo.org> less-394.ebuild:
  Stable on ppc64; bug #133163
  13 May 2006; Thomas Cort <tcort@gentoo.org> less-394.ebuild:
  Stable on alpha wrt Bug #133163.
  13 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> less-394.ebuild:
  Stable on sparc wrt #133163
  13 May 2006; Krzysiek Pawlik <nelchael@gentoo.org> less-394.ebuild:
  Stable on x86, see bug #133163.
  13 May 2006; Simon Stelling <blubb@gentoo.org> less-394.ebuild:
  stable on amd64
  13 May 2006; Emanuele Giaquinta <exg@gentoo.org> less-394.ebuild:
  Stable on ppc; bug #133163
  27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-less-382-r2,
  files/digest-less-385_p4-r2, files/digest-less-394, Manifest:
  Fixing SHA256 digest, pass four
  03 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> less-394.ebuild:
  Add ~x86-fbsd keyword.
  26 Feb 2006; Mike Frysinger <vapier@gentoo.org> +files/README.Gentoo,
  less-394.ebuild:
  Add a Gentoo README explaining enhancements we add #124184 by Randall Nortman.
 *less-394 (28 Dec 2005)
  28 Dec 2005; Mike Frysinger <vapier@gentoo.org> +less-394.ebuild:
  Version bump #116983 by Michael Cramer.
  24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> less-385_p4-r2.ebuild:
  Stable on ppc.
  21 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> less-385_p4-r2.ebuild:
  Stable on amd64.
  18 Dec 2005; Markus Rothe <corsair@gentoo.org> less-385_p4-r2.ebuild:
  Stable on ppc64
  05 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org> less-385_p4-r2.ebuild:
  Stable on sparc
  03 Dec 2005; Andrej Kacian <ticho@gentoo.org> less-385_p4-r2.ebuild:
  Stable on x86, bug #114301.
 *less-393 (02 Dec 2005)
  02 Dec 2005; Mike Frysinger <vapier@gentoo.org> +less-393.ebuild:
  Version bump #113085 by Benno Schulenberg.
 *less-385_p4-r2 (16 Oct 2005)
  16 Oct 2005; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh,
  +less-385_p4-r2.ebuild:
  Tweak the manpage case in lesspipe.sh to display compressed text files which
  are named funny #109419.
  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
  Converted to UTF-8, fixed encoding screwups
 *less-385_p4-r1 (24 Aug 2005)
  24 Aug 2005; Mike Frysinger <vapier@gentoo.org> +files/code2color.patch,
  +less-385_p4-r1.ebuild:
  Add support for more filetypes and colorize support #46587 by José Romildo
  Malaquias.
  18 Aug 2005; Mike Frysinger <vapier@gentoo.org> less-382-r2.ebuild,
  less-385.ebuild, less-385_p4.ebuild:
  Add a PROVIDE for virtual/pager.
 *less-385_p4 (19 Jun 2005)
  19 Jun 2005; Mike Frysinger <vapier@gentoo.org> +less-385_p4.ebuild:
  Version bump with patch from Charles Levert.
  18 Jun 2005; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
  Import ideas from Redhats lesspipe.sh and add support for more files.
 *less-385 (23 May 2005)
  23 May 2005; Mike Frysinger <vapier@gentoo.org> +less-385.ebuild:
  Version bump which have UTF8 fixes #93656 by Eugene Pavlovsky.
  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
  Change encoding to UTF-8 for GLEP 31 compliance
  27 Sep 2004; Bart Lauwers <blauwers@gentoo.org> less-382-r2.ebuild:
  Fix lesspipe error
  11 Sep 2004; Tom Martin <slarti@gentoo.org> less-382-r2.ebuild:
  Stable on amd64.
  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> less-382-r2.ebuild:
  Stable on hppa.
  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> less-382-r2.ebuild,
  less-382.ebuild:
  Masked less-382.ebuild stable for ppc
  03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> less-382-r2.ebuild:
  Masked less-382-r2.ebuild stable for ppc
  21 Aug 2004; Joshua Kinard <kumba@gentoo.org> less-382-r2.ebuild:
  Marked stable on mips.
  19 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> less-382-r2.ebuild:
  Stable on sparc
  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> less-382-r2.ebuild:
  stable on alpha, ia64 and x86
 *less-382-r2 (16 Jun 2004)
  16 Jun 2004; Aron Griffis <agriffis@gentoo.org> files/lesspipe.sh-r2,
  -less-382-r1.ebuild:
  Fix a quoting issue in lesspipe.sh-r2 and add a trap to prevent 'Broken pipe'
  messages. Thanks to Glen in bug 38854
 *less-382-r1 (15 Jun 2004)
  15 Jun 2004; Aron Griffis <agriffis@gentoo.org> +files/lesspipe.sh-r2,
  +less-382-r1.ebuild:
  Fix bugs 18823 (lesspipe.sh misdetects troff files) and 38854
  (lesspipe enchancments + cannot see some files with spaces).  Thanks
  to Niels Teglsbo and Glen for the suggestions.
  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> less-382.ebuild:
  Stable on alpha.
  05 Jun 2004; Travis Tilley <lv@gentoo.org> less-382.ebuild:
  stable on amd64
  02 Mar 2004; Brian Jackson <iggy@gentoo.org> less-382.ebuild:
  adding initial s390 support
 *less-382 (16 Feb 2004)
  16 Feb 2004; Brandon Low <lostlogic@gentoo.org> less-382.ebuild:
  Bump
 *less-381 (26 Mar 2003)
  06 Jul 2003; Joshua Kinard <kumba@gentoo.org> less-381.ebuild:
  Changed ~mips to mips in KEYWORDS
  23 Jun 2003; Aron Griffis <agriffis@gentoo.org> less-381.ebuild:
  Mark stable on alpha
  16 Apr 2003; Guy Martin <gmsoft@gentoo.org> less-381.ebuild :
  Marked stable on hppa.
  02 Apr 2003; Christian Birchinger <joker@gentoo.org> less-381.ebuild:
  Added stable sparc keyword
  26 Mar 2003; Daniel Robbins <drobbins@gentoo.org> less-381.ebuild:
  New upstream release; marked ~x86.
 *less-378-r2 (08 Feb 2003)
  20 Mar 2003; Rajiv Manglani <rajiv@gentoo.org> less-378-r2.ebuild :
  Marked stable for ppc and sparc. This version of less (with LESS=-R
  set in the environment) is needed by groff-1.18 and later. That version
  of groff is needed by man-1.5l. man-1.5l is needed to fix a security
  issue in previous versions of man.
  28 Feb 2003; Zach Welch <zwelch@gentoo.org> less-378-r2.ebuild :
  add arm keyword
  25 Feb 2003; Guy Martin <gmsoft@gentoo.org> less-378-r2.ebuild :
  Added hppa to keywords.
  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> less-378-r2.ebuild :
  Mark as stable for mips.
  08 Feb 2003; Martin Schlemmer <azarah@gentoo.org> less-378-r2.ebuild :
  Change the LESS="-r" env variable to "-R".  This should close bug #13882.
 *less-378-r1 (26 Dec 2002)
  09 Feb 2003; Guy Martin <gmsoft@gentoo.org> less-378-r1.ebuild :
  Added hppa to keywords.
 24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> less-378-r1.ebuild :
  Mark as stable for mips.
  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> less-378-r1.ebuild :
  Add /etc/env.d/70less containing 'LESS="-r"' for groff-1.18 and later support.
  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
 *less-378 (07 Jul 2002)
  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
  Added mips to keywords
  07 Oct 2002; Brandon Low <lostlogic@gentoo.org> less-378.ebuild :
  Version bump.
 *less-376 (03 Jul 2002)
  03 Oct 2002; Brad Cowan <bcowan@gentoo.org> less-376.ebuild :
  Added --sysconfdir=/etc, fixes bug #8639
  14 Jul 2002; phoen][x <phoenix@gentoo.org> less-376.ebuild :
  Added KEYWORDS, SLOT.
  03 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
  New version; thanks to Terry Chan.
 *less-371-r1 (1 Feb 2002)
  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
  Added initial ChangeLog which should be updated whenever the package is
  updated in any way. This changelog is targetted to users. This means that the
  comments should well explained and written in clean English. The details about
  writing correct changelogs are explained in the skel.ChangeLog file which you
  can find in the root directory of the portage repository.
--- a/sdk_container/src/third_party/portage-stable/sys-apps/less/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/Manifest
@ -1,13 +1,13 @@
 AUX README.Gentoo 823 SHA256 3985fd1810f660ea1c1f2732f719b069b6934d62d8d9e8a09287e63f049ba27d SHA512 fe18f4f5bac70f31ca833cb25d4f1aecde03c3993495ab964cc67f0e52737e3d04aa2263eff26ded279121cc346ef77738743943b5b092c9586c5622ee3a6c92 WHIRLPOOL 7b4de4d109da49392cf9ded961fc9aa0a7cda1ff82dc837b0303f02d00f76f73563397c14440ab0c8638a5a2a92e3b6c62f20a904ae7cd1dd0f5eb8efa68ec39
 AUX code2color-0.2.patch 919 SHA256 1792992964eb024150025b6e357649e07dab6209254512cc9be1a7d5bcc31b77 SHA512 6569c652dc5bcff9eb0eb3d85699b319f1439bb69268157d2d63a96ebe5a48577ed2f5e6af4510a8c742b38848e5f76a79397fd3b05e7acaf487955d60f6b5ce WHIRLPOOL d661d0226a753e4aaf1d60dc1fc756e05a78490d5781df54db1c2da73fee0a44edf4e70f28aeb9ca6e888a2d5c8cb94f3ed9e864c034d9e9b7219e2f6e191600
 AUX less.envd 47 SHA256 961d6e87eeb2b41d163def66718ee78d4b7c778dbe91b24c6764635b0ae1cdd7 SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 WHIRLPOOL dbb1fbec8c6370a5feec2eecdb3e109e035f2f40c2a1d00672d7660d2058aaf0a104487e1ae8c06ecfb32161d4aa2aceed6194e60cacde3590974bbcb00511ba
-AUX lesspipe.sh 7513 SHA256 284545aaf3e9312d5e8f6a7a447f09e023b2c13e063913e8a2952cd16fdac0a5 SHA512 8ecca0cbaff3862441c286c7aa2eeecd910ea9f61ab0bf85c70b1539031185c1172b9e190437ab1c47cb79abae4efe080ac36704bc0ca5cb60fc470ea1645c49 WHIRLPOOL 148ba894d276a5bdd559fbbc20fce24aeec567142fc7a52726cf59a1dfeaf23d3b644109f2e70813b4edeaf2eff41ac7c9e146b52054548744f3d5e1042a0f51
+AUX lesspipe.sh 7785 SHA256 e63251d3cef88ab34c74d498baf29908396fbd660f4c685e913347a9a2d102a9 SHA512 607079051a9d5bda5f11addf5a391fb1dac48654e422dd216b8ec56f8e50943d3267d7d66eab49caceaf73b491d13fe045f424173f0da707250d3f86e790aa32 WHIRLPOOL 740f48bf929690a6bd162f8eab996b6dc96c46442b4023cd36bbf2335c707e79a4143f72606c7953232e25f453dd6e1fd63cdc32c60002abc6ca7e3eddc2f2e1
-DIST code2color-0.2 200711 SHA256 2365c9009b1cc3c30430b88775ec402164df105fd12364871d05dcaed20be954 SHA512 c0ab9f411d5a106c81334343e3c4a63b67d27b95e2d128145e3ac1ee46cd6c228c61796cf96e51826e69b3e465e7bdaa81b1a48cad934c23b310f2ea2ebd8e75 WHIRLPOOL d0207e84a5849c554b1dfc5882ab46d8afc411c7d26e912235ec05565880e6ed0db8449133502234a01ae8f59feae211486b6a523e37859d8404f72fff9b8f93
+DIST less-487.tar.gz 318488 SHA256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a WHIRLPOOL e1a6c5dc2ea17e57226083f022d3c39b8a9d17428b7aa15385138680e78fa1ee22800e216a40fe5aa0ca38ca4c0025792a2839031faabdf8f9384dec3c750f74
-DIST less-478.tar.gz 316439 SHA256 495c7df52199a0c7e6bfbbe7697b2b54f4bf197c8b10b43957762d74483574ce SHA512 f985b427db50f6a488b0ff5b8e94094d093249c0e021b652b728d52deb89749eb9cd688651e76e045f88c4e327e6b7ac888ce70acf41fb5fe10d6742fc21216e WHIRLPOOL c9cfc181705c1c960d7693b7917bfe911b4673d7955a0ec25e1a5ab928de8d41328290155b76fb1525c91e58dccf41d592ab313594d2a8305acad87a21f141c2
+DIST less-488.tar.gz 318564 SHA256 f3b622a7b1d29a28b327357cacfd3b0e8e50710eeb6d290107e478f3f0ca15a2 SHA512 2483fd417981a92b415989ecca4e58e239ad71d687b59674f0c5557c2ff4f6d111f7dd528f15fe7002217125597f329a70a831f5d7ea67883ed8c236a0a7e6c6 WHIRLPOOL bce3064c2ee7fb1c7e0737dfb0743b1aa8210f3b14b36701a8a6c478098a4b7af18162060ff37d56311ebfe037e3138a18784cb63fbd7aa0a37f19433271faf6
-DIST less-479.tar.gz 316484 SHA256 5bf06cb30ee2a2bd1f79f39aa91e46444e7cb19b48c95c4992fa63cfe4527a80 SHA512 56ecfd3c4e586a926e609dabb278eea1554a4a70a1d1d675cea2e9d69ae764f646b25eab197032db6aa571c22a3550ec11a3a7ef556e0d4523092c7a5daaa030 WHIRLPOOL 9b667e1267cd079cbde0a97379495f8f6034be73e0211cb5cae24509671d582fd2e930aa7dd150a1872184eea0e53f5c7fd9decfe4dc1ee38af3b94f3158fd67
+DIST less-491.tar.gz 320276 SHA256 1b40da1d58e9604b50bc75fd31c8591e6138a627a9525572c6c4232dee4c83fd SHA512 51f3e6d835066c16392cbf8b804d204b53ef128ce0c6d8553c7722351b7b48760abf516236c7ff6b83fd66700c01e78e90c836d6b82b726dd3a3bede851edf61 WHIRLPOOL 6c05eae01e506f7a3ea198736e3ad38e2711c6f968867c3d731318acab8d399505b01711a0f4a60ef7110c3b05f056ba133176d07f2d44b39e9ad4f81cff6cce
-DIST less-481.tar.gz 316622 SHA256 3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5 SHA512 29995757ac416ed6770cf6e82e6fe325bd1d61d51666d80c4fe72b2b4217b0b1d706d337d89ed54bdc4d83d57f3e2c0166e642b20ef2ad194e52aad630b3e717 WHIRLPOOL e5c8b22d7d1149feafdad0130e00aa5564e818a845c3b4e2b6d151e851dd64ff390fdad01ee79580fe6ab92defc11930d3f3e0ca0d189d2882419444a3d7028c
+EBUILD less-487.ebuild 1440 SHA256 387fd47561a791fda5a06b659155abc842eecc64978cc53444d2576fbca67c35 SHA512 b7a1ee3d58a3ad29c3ef7d50f5f37c9fea7bbd0bf15a157f323ced895daf6a1aa31544374428df2ebd4e3385897e6721cf530b0c21de688e3cd0dee9c7e2939c WHIRLPOOL db87dbeb58f0cf81532abbc87a803083223776ab4200553163c361acdc20cf34bc4d8760e2f0db336eccd0ffc52e4900b096e8e48f1c9ed4c6d561a0a13e2260
-EBUILD less-478.ebuild 1642 SHA256 41001dc308be01a03c22d68268b021592f6ae28f26c99be91cd1a6c4c722500e SHA512 da4c96b80ca357ab90ea7a53439b00c4f1c6f3d5958048295473c947635548a970908441ca05a474d081b5283874276da1b3136e30545333aecb115d57cdffba WHIRLPOOL 9a4a5d7506d1436831d0fd47eab9703c99e3dddfd06b2c7e8c5543e19f109e434a3edb8f5c5aad14e5f91dc7fcee071f69c4fb88e79d8c2b6a3d89c21cbd7518
+EBUILD less-488.ebuild 1453 SHA256 8926c4e70c762a2b3ea6ce9cc257931c9e0e679d473ef5970819ce05819e57db SHA512 bbb6d6d31b82326a901a323ba847caa7c7fb4aa615895a0c86010a170c34f15c54be6a3f1ca1552e49b63033a3c1d1b67e9ced8ad33b5e0536a63fcf8be5f8a8 WHIRLPOOL 5b2bc3c8cc5fe4e23f9963d5d994b4efc97e5842d695afbe7aaf2ceeec7e0bcc49b4b2afa124e1549849a2f56f3e6b6bb6300d7ed79e097cb1c12aa702288b98
-EBUILD less-479.ebuild 1655 SHA256 0b268f635c309ed4ee48098b399745fd328875f596e835c3489ce80e5ec18c75 SHA512 074d90ee483cf81acc476910ee12013051434d5d47a43b5cc746037626b497a856a0af81233c814b06797506e25d98b1e908d67d8b4786893496cff07ddb1f4b WHIRLPOOL 7a472c642e32c287732e93cc957758b6538c435aee0965feed7d00742c3cd89b1fee382af6fdc0c4087609b47830ff5349649fa871f526a22145036ca2e4b96b
+EBUILD less-491.ebuild 1453 SHA256 8926c4e70c762a2b3ea6ce9cc257931c9e0e679d473ef5970819ce05819e57db SHA512 bbb6d6d31b82326a901a323ba847caa7c7fb4aa615895a0c86010a170c34f15c54be6a3f1ca1552e49b63033a3c1d1b67e9ced8ad33b5e0536a63fcf8be5f8a8 WHIRLPOOL 5b2bc3c8cc5fe4e23f9963d5d994b4efc97e5842d695afbe7aaf2ceeec7e0bcc49b4b2afa124e1549849a2f56f3e6b6bb6300d7ed79e097cb1c12aa702288b98
-EBUILD less-481.ebuild 1658 SHA256 1c00f9c92607f98c328d39f6db01dbd4a127a2b336a8e37a881dd405624490e5 SHA512 ca07a5b37c4ce435059dacb6423f59434a47173a73bb819f89d9848d34df210fd9a20767fa6bf05e25e9762cf337200e9c6686f0528bf915f904216aaead7444 WHIRLPOOL ab08ca6027991bae8ecae8c28243bcce9b520a5b82ca457b2aaf3074c581ea533809edc6b7479ebcc8cf7bb732f50cc5d5f95fe17b615a6d7192ac97734eb16a
+MISC ChangeLog 6770 SHA256 231ea462342a5410001f601c3b5be0b8aecddd4bda45ced16d823e54588943ff SHA512 1eeea73307e6c68f8c4026bc22d42fed0b4b3fc6eadf00967cd7f525b3c5843353c2be38591892e6444d2f3d6a374e58a960a0e969c4d9153a373a286c2590ee WHIRLPOOL 15496a1ff7dad80804d3bb76da1508d45e3bccb22bb8452cf6d63438c1d30913dc3da6159e0d426ebac27d1d68e3dcbde154f6c8e7fcc0198225bb4f1469f466
-MISC ChangeLog 23847 SHA256 825f54e1e57d50358f5dc9a197553cb4e9472a7aea705968075815cfd5f90527 SHA512 99e9ed06109e4967a2cdba06c9116fbd1ae7a33489a758ae001c809e3bba6dfa107b3d67dfa69ccdb0ebeaae51c24cb144b13f8c1f46d0e26a274cb1b2e1ece8 WHIRLPOOL a27d97c7da86ff507da122e0e54eb5729e55c2eed535cc86a9d3775f59a2b70c35e70fc6220728c36d893aff0ff546cb8ecccc86a3e61c284966f50dc21ef7fb
+MISC ChangeLog-2015 23847 SHA256 825f54e1e57d50358f5dc9a197553cb4e9472a7aea705968075815cfd5f90527 SHA512 99e9ed06109e4967a2cdba06c9116fbd1ae7a33489a758ae001c809e3bba6dfa107b3d67dfa69ccdb0ebeaae51c24cb144b13f8c1f46d0e26a274cb1b2e1ece8 WHIRLPOOL a27d97c7da86ff507da122e0e54eb5729e55c2eed535cc86a9d3775f59a2b70c35e70fc6220728c36d893aff0ff546cb8ecccc86a3e61c284966f50dc21ef7fb
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
--- a/sdk_container/src/third_party/portage-stable/sys-apps/less/files/lesspipe.sh
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/files/lesspipe.sh
@ -59,6 +59,15 @@ lesspipe() {
 		[[ ${match} == *.${ignore} ]] && exit 0
 	done
 	# Handle non-regular file types.
 	if [[ -d $1 ]] ; then
 		ls -alF -- "$1"
 		return
 	elif [[ ! -f $1 ]] ; then
 		stat "$1"
 		return
 	fi
 	case "${match}" in
 	### Doc files ###
@ -90,7 +99,8 @@ lesspipe() {
 		esac
 		;;
 	*.dvi)      dvi2tty "$1" ;;
-	*.ps|*.pdf) ps2ascii "$1" || pstotext "$1" || pdftotext "$1" ;;
+	*.ps)       ps2ascii "$1" || pstotext "$1" ;;
 	*.pdf)      pdftotext "$1" - || ps2ascii "$1" || pstotext "$1" ;;
 	*.doc)      antiword "$1" || catdoc "$1" ;;
 	*.rtf)      unrtf --nopict --text "$1" ;;
 	*.conf|*.txt|*.log) ;; # force less to work on these directly #150256
@ -152,7 +162,7 @@ lesspipe() {
 	### Media ###
 	*.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp)
-		identify "$1" || file -L -- "$1"
+		identify -verbose -- "$1" || file -L -- "$1"
 		;;
 	*.asf|*.avi|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv)
 		midentify "$1" || file -L -- "$1"
@ -234,14 +244,12 @@ lesspipe() {
 if [[ -z $1 ]] ; then
 	echo "Usage: lesspipe <file>"
 elif [[ $1 == "-V" || $1 == "--version" ]] ; then
 	Id="cvsid"
 	cat <<-EOF
-		$Id$
+		lesspipe (git)
-		Copyright 2001-2013 Gentoo Foundation
+		Copyright 2001-2016 Gentoo Foundation
 		Mike Frysinger <vapier@gentoo.org>
 		     (with plenty of ideas stolen from other projects/distros)
 	EOF
 	less -V
 elif [[ $1 == "-h" || $1 == "--help" ]] ; then
@ -251,21 +259,20 @@ elif [[ $1 == "-h" || $1 == "--help" ]] ; then
 		Usage: lesspipe <file>
 		lesspipe specific settings:
-		  LESSCOLOR env     - toggle colorizing of output (no/yes/always)
+		  LESSCOLOR env     - toggle colorizing of output (no/yes/always; default: no)
 		  LESSCOLORIZER env - program used to colorize output (default: code2color)
 		  LESSIGNORE        - list of extensions to ignore (don't do anything fancy)
 		You can create per-user filters as well by creating the executable file:
 		  ~/.lessfilter
-		One argument is passed to it: the file to display.
+		One argument is passed to it: the file to display.  The script should exit 0
 		to indicate it handled the file, or non-zero to tell lesspipe to handle it.
 		To use lesspipe, simply add to your environment:
 		  export LESSOPEN="|lesspipe %s"
-		Run 'less --help' or 'man less' for more info
+		Run 'less --help' or 'man less' for more info.
 	EOF
 elif [[ -d $1 ]] ; then
 	ls -alF -- "$1"
 else
 	recur=0
 	[[ -n ${LESSDEBUG} ]] \
--- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-478.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-478.ebuild
@ -1,57 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="4"
 inherit eutils
 CODE2COLOR_PV="0.2"
 CODE2COLOR_P="code2color-${CODE2COLOR_PV}"
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz
 	http://www-zeuthen.desy.de/~friebel/unix/less/code2color -> ${CODE2COLOR_P}"
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 DEPEND=">=app-misc/editor-wrapper-3
 	>=sys-libs/ncurses-5.2
 	pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}"
 src_unpack() {
 	unpack ${P}.tar.gz
 	cp "${DISTDIR}"/${CODE2COLOR_P} "${S}"/code2color || die
 }
 src_prepare() {
 	epatch "${FILESDIR}"/${CODE2COLOR_P}.patch
 	chmod a+x configure || die
 }
 src_configure() {
 	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
 	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
 	econf \
 		--with-regex=$(usex pcre pcre posix) \
 		--with-editor="${EPREFIX}"/usr/libexec/editor
 }
 src_install() {
 	default
 	dobin code2color
 	newbin "${FILESDIR}"/lesspipe.sh lesspipe
 	dosym lesspipe /usr/bin/lesspipe.sh
 	newenvd "${FILESDIR}"/less.envd 70less
 	dodoc "${FILESDIR}"/README.Gentoo
 }
 pkg_postinst() {
 	elog "lesspipe offers colorization options.  Run 'lesspipe -h' for info."
 }
--- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-479.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-479.ebuild
@ -1,57 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="4"
 inherit eutils
 CODE2COLOR_PV="0.2"
 CODE2COLOR_P="code2color-${CODE2COLOR_PV}"
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz
 	http://www-zeuthen.desy.de/~friebel/unix/less/code2color -> ${CODE2COLOR_P}"
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 DEPEND=">=app-misc/editor-wrapper-3
 	>=sys-libs/ncurses-5.2
 	pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}"
 src_unpack() {
 	unpack ${P}.tar.gz
 	cp "${DISTDIR}"/${CODE2COLOR_P} "${S}"/code2color || die
 }
 src_prepare() {
 	epatch "${FILESDIR}"/${CODE2COLOR_P}.patch
 	chmod a+x configure || die
 }
 src_configure() {
 	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
 	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
 	econf \
 		--with-regex=$(usex pcre pcre posix) \
 		--with-editor="${EPREFIX}"/usr/libexec/editor
 }
 src_install() {
 	default
 	dobin code2color
 	newbin "${FILESDIR}"/lesspipe.sh lesspipe
 	dosym lesspipe /usr/bin/lesspipe.sh
 	newenvd "${FILESDIR}"/less.envd 70less
 	dodoc "${FILESDIR}"/README.Gentoo
 }
 pkg_postinst() {
 	elog "lesspipe offers colorization options.  Run 'lesspipe -h' for info."
 }
--- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-481.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-481.ebuild
@ -1,57 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
 inherit eutils
 CODE2COLOR_PV="0.2"
 CODE2COLOR_P="code2color-${CODE2COLOR_PV}"
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz
 	http://www-zeuthen.desy.de/~friebel/unix/less/code2color -> ${CODE2COLOR_P}"
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
 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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 DEPEND=">=app-misc/editor-wrapper-3
 	>=sys-libs/ncurses-5.2:0=
 	pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}"
 src_unpack() {
 	unpack ${P}.tar.gz
 	cp "${DISTDIR}"/${CODE2COLOR_P} "${S}"/code2color || die
 }
 src_prepare() {
 	epatch "${FILESDIR}"/${CODE2COLOR_P}.patch
 	chmod a+x configure || die
 }
 src_configure() {
 	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
 	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
 	econf \
 		--with-regex=$(usex pcre pcre posix) \
 		--with-editor="${EPREFIX}"/usr/libexec/editor
 }
 src_install() {
 	default
 	dobin code2color
 	newbin "${FILESDIR}"/lesspipe.sh lesspipe
 	dosym lesspipe /usr/bin/lesspipe.sh
 	newenvd "${FILESDIR}"/less.envd 70less
 	dodoc "${FILESDIR}"/README.Gentoo
 }
 pkg_postinst() {
 	elog "lesspipe offers colorization options.  Run 'lesspipe -h' for info."
 }
--- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-487.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-487.ebuild
@ -0,0 +1,46 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI="5"
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 DEPEND=">=app-misc/editor-wrapper-3
 	>=sys-libs/ncurses-5.2:0=
 	pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}"
 src_prepare() {
 	chmod a+x configure || die
 }
 src_configure() {
 	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
 	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
 	econf \
 		--with-regex=$(usex pcre pcre posix) \
 		--with-editor="${EPREFIX}"/usr/libexec/editor
 }
 src_install() {
 	default
 	newbin "${FILESDIR}"/lesspipe.sh lesspipe
 	newenvd "${FILESDIR}"/less.envd 70less
 }
 pkg_preinst() {
 	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
 		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
 		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
 		elog "Colorization support has been dropped.  If you want that, check out"
 		elog "the new app-text/lesspipe package."
 	fi
 }
--- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-488.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-488.ebuild
@ -0,0 +1,46 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI="5"
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 DEPEND=">=app-misc/editor-wrapper-3
 	>=sys-libs/ncurses-5.2:0=
 	pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}"
 src_prepare() {
 	chmod a+x configure || die
 }
 src_configure() {
 	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
 	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
 	econf \
 		--with-regex=$(usex pcre pcre posix) \
 		--with-editor="${EPREFIX}"/usr/libexec/editor
 }
 src_install() {
 	default
 	newbin "${FILESDIR}"/lesspipe.sh lesspipe
 	newenvd "${FILESDIR}"/less.envd 70less
 }
 pkg_preinst() {
 	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
 		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
 		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
 		elog "Colorization support has been dropped.  If you want that, check out"
 		elog "the new app-text/lesspipe package."
 	fi
 }
--- a/sdk_container/src/third_party/portage-stable/sys-apps/less/less-491.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/less-491.ebuild
@ -0,0 +1,46 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI="5"
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
 SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 DEPEND=">=app-misc/editor-wrapper-3
 	>=sys-libs/ncurses-5.2:0=
 	pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}"
 src_prepare() {
 	chmod a+x configure || die
 }
 src_configure() {
 	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
 	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
 	econf \
 		--with-regex=$(usex pcre pcre posix) \
 		--with-editor="${EPREFIX}"/usr/libexec/editor
 }
 src_install() {
 	default
 	newbin "${FILESDIR}"/lesspipe.sh lesspipe
 	newenvd "${FILESDIR}"/less.envd 70less
 }
 pkg_preinst() {
 	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
 		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
 		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
 		elog "Colorization support has been dropped.  If you want that, check out"
 		elog "the new app-text/lesspipe package."
 	fi
 }
--- a/sdk_container/src/third_party/portage-stable/sys-apps/less/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/less/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
 </pkgmetadata>