From 1221967abac061567f58f63c240ecd2dd77df058 Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Tue, 17 Jan 2017 15:17:53 -0800
Subject: [PATCH] bump(dev-lang/python-exec): sync with upstream

---
 .../dev-lang/python-exec/ChangeLog            |  84 ----------
 .../dev-lang/python-exec/Manifest             |  42 ++---
 .../dev-lang/python-exec/metadata.xml         |  20 ++-
 .../python-exec/python-exec-2.0.1-r1.ebuild   |   6 +-
 ...3.1-r1.ebuild => python-exec-2.0.2.ebuild} |  10 +-
 ...c-0.9999.ebuild => python-exec-2.1.ebuild} |  39 ++---
 .../python-exec/python-exec-2.4.3.ebuild      | 134 ++++++++++++++++
 .../python-exec/python-exec-2.4.4.ebuild      | 134 ++++++++++++++++
 .../python-exec/python-exec-2.9999.ebuild     |  50 ------
 .../python-exec/python-exec-9999.ebuild       | 149 ++++++++++++++++++
 .../md5-cache/dev-lang/python-exec-0.9999     |  11 --
 .../md5-cache/dev-lang/python-exec-2.0.1-r1   |   6 +-
 ...python-exec-0.3.1-r1 => python-exec-2.0.2} |   8 +-
 .../md5-cache/dev-lang/python-exec-2.1        |  12 ++
 .../md5-cache/dev-lang/python-exec-2.4.3      |  12 ++
 .../md5-cache/dev-lang/python-exec-2.4.4      |  12 ++
 .../md5-cache/dev-lang/python-exec-2.9999     |  11 --
 .../md5-cache/dev-lang/python-exec-9999       |  11 ++
 18 files changed, 519 insertions(+), 232 deletions(-)
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python-exec/ChangeLog
 rename sdk_container/src/third_party/portage-stable/dev-lang/python-exec/{python-exec-0.3.1-r1.ebuild => python-exec-2.0.2.ebuild} (74%)
 rename sdk_container/src/third_party/portage-stable/dev-lang/python-exec/{python-exec-0.9999.ebuild => python-exec-2.1.ebuild} (50%)
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.3.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.4.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.9999.ebuild
 create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-9999.ebuild
 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-0.9999
 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/{python-exec-0.3.1-r1 => python-exec-2.0.2} (83%)
 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.1
 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.4.3
 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.4.4
 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.9999
 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-9999

diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/ChangeLog
deleted file mode 100644
index 7cdd3075c5..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/ChangeLog
+++ /dev/null
@@ -1,84 +0,0 @@
-# ChangeLog for dev-lang/python-exec
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python-exec/ChangeLog,v 1.19 2014/07/06 13:18:50 mgorny Exp $
-
-  06 Jul 2014; Michał Górny <mgorny@gentoo.org> python-exec-0.3.1-r1.ebuild,
-  python-exec-0.9999.ebuild, python-exec-2.0.1-r1.ebuild,
-  python-exec-2.9999.ebuild:
-  Replace obsolete mirror://bitbucket with the real URI.
-
-  16 May 2014; Michał Górny <mgorny@gentoo.org> -python-exec-0.3.1.ebuild,
-  -python-exec-2.0.1.ebuild, -python-exec-2.0.ebuild:
-  Drop old.
-
-*python-exec-2.0.1-r1 (06 Mar 2014)
-*python-exec-0.3.1-r1 (06 Mar 2014)
-
-  06 Mar 2014; Michał Górny <mgorny@gentoo.org> +python-exec-0.3.1-r1.ebuild,
-  +python-exec-2.0.1-r1.ebuild, python-exec-0.9999.ebuild,
-  python-exec-2.9999.ebuild:
-  Remove dev-python/python-exec PDEP since it is going for p.mask.
-
-  29 Jan 2014; Mike Frysinger <vapier@gentoo.org> python-exec-0.3.1.ebuild,
-  python-exec-0.9999.ebuild, python-exec-2.0.1.ebuild, python-exec-2.0.ebuild,
-  python-exec-2.9999.ebuild:
-  Fix LICENSE to right value.
-
-  18 Jan 2014; Mike Frysinger <vapier@gentoo.org> python-exec-0.3.1.ebuild,
-  python-exec-0.9999.ebuild, python-exec-2.0.1.ebuild, python-exec-2.0.ebuild,
-  python-exec-2.9999.ebuild:
-  Add arm64 love.
-
-  18 Jan 2014; Mike Frysinger <vapier@gentoo.org> python-exec-0.3.1.ebuild,
-  python-exec-2.0.1.ebuild:
-  Mark m68k/s390/sh stable.
-
-  01 Dec 2013; Akinori Hattori <hattya@gentoo.org> python-exec-2.0.1.ebuild:
-  ia64 stable wrt bug #491420
-
-  24 Nov 2013; Agostino Sarubbo <ago@gentoo.org> python-exec-2.0.1.ebuild:
-  Stable for x86, wrt bug #491420
-
-  24 Nov 2013; Agostino Sarubbo <ago@gentoo.org> python-exec-2.0.1.ebuild:
-  Stable for sparc, wrt bug #491420
-
-  24 Nov 2013; Agostino Sarubbo <ago@gentoo.org> python-exec-2.0.1.ebuild:
-  Stable for ppc, wrt bug #491420
-
-  24 Nov 2013; Agostino Sarubbo <ago@gentoo.org> python-exec-2.0.1.ebuild:
-  Stable for ppc64, wrt bug #491420
-
-  24 Nov 2013; Agostino Sarubbo <ago@gentoo.org> python-exec-2.0.1.ebuild:
-  Stable for arm, wrt bug #491420
-
-  24 Nov 2013; Agostino Sarubbo <ago@gentoo.org> python-exec-2.0.1.ebuild:
-  Stable for alpha, wrt bug #491420
-
-  23 Nov 2013; Pacho Ramos <pacho@gentoo.org> python-exec-2.0.1.ebuild:
-  amd64 stable, bug #491420
-
-  19 Nov 2013; Jeroen Roovers <jer@gentoo.org> python-exec-2.0.1.ebuild:
-  Stable for HPPA (bug #491420).
-
-*python-exec-2.0.1 (16 Nov 2013)
-
-  16 Nov 2013; Michał Górny <mgorny@gentoo.org> +python-exec-2.0.1.ebuild:
-  Version bump. Fix unitialized memory access, bug #491410.
-
-  15 Nov 2013; Robin H. Johnson <robbat2@gentoo.org> python-exec-0.3.1.ebuild,
-  python-exec-0.9999.ebuild, python-exec-2.0.ebuild, python-exec-2.9999.ebuild:
-  Use PDEPEND to fix python-exec dep for all users, acked by ZeroChaos & mgorny
-  in #gentoo-dev.
-
-  09 Nov 2013; Pacho Ramos <pacho@gentoo.org> python-exec-2.0.ebuild:
-  amd64 stable, bug #488682
-
-*python-exec-0.9999 (30 Oct 2013)
-*python-exec-2.9999 (30 Oct 2013)
-*python-exec-0.3.1 (30 Oct 2013)
-*python-exec-2.0 (30 Oct 2013)
-
-  30 Oct 2013; Michał Górny <mgorny@gentoo.org> +metadata.xml,
-  +python-exec-0.3.1.ebuild, +python-exec-0.9999.ebuild,
-  +python-exec-2.0.ebuild, +python-exec-2.9999.ebuild:
-  Move the real ebuilds of dev-python/python-exec to dev-lang/python-exec.
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/Manifest
index bba4917108..b69434e4e7 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/Manifest
@@ -1,30 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST python-exec-0.3.1.tar.bz2 74441 SHA256 460837775167108419b9497353a6f832fc8a249c341469dd235c70633ac37557 SHA512 764d1aaf3b4f9679be6ab1105b4b4d9222b245502114ee3d451b4507f86679ae05136eeae3337351c80b52ee03b9461a2f89c87e63cc4cbb76a1023fb243f84e WHIRLPOOL 6b34c2f44976a33a67269c766bd13401b6b1b39fad3d5df6bbef2bd06e15e09bd2ac13123718b8fa0bdb67f812c7407192b9c16860ab442d3c35259afeb3da82
 DIST python-exec-2.0.1.tar.bz2 80965 SHA256 3eddcb0d6c682a5c182c62578bb8d6ce1140a009873747e9ba1bf9de72ed7efd SHA512 0396e2617c759a66b16e57b0ca60b57e03f3c8096ae4a7f2e402eafcbee4ffd839bf0c6e4d259c6ba90940f9ba7e3f191125e395080cce3ef82e5f52053d0462 WHIRLPOOL 50c0cac1c7e2b5d2a21125647874c83caeabee293b87ef01926474d492b79b7837754c2d26173282977e9d00024559bb070f8d76bb5227df1776e937cd280c32
-EBUILD python-exec-0.3.1-r1.ebuild 1153 SHA256 803eeb67ee0424d25c93d40470a5f6284ba92f6f8b4a9e09f5dd6183ca8ba8a5 SHA512 137398fd5c5f59826506805e4de1ab638abc8c9d616e81d8415c61f9d5d3a5caa7f238efb372a1c2d0efd6619d3d09f13d64ade2e9185ccb01ddceda0fec7474 WHIRLPOOL 359a526c02478ba8228d1fd1d60511a00470924089d05f73efcbcb453e895bc2629f5d2c947a4ea40b80c43c1c97ffed3819f7c6267f345492a25d5270320ec4
-EBUILD python-exec-0.9999.ebuild 1312 SHA256 ff6b5b0795dbca84b66e383b812a6957eaccfb8abf143cc32b4c32bb17b7b113 SHA512 ac611885fc1e6659eeb9e792a832af98dfc1833078a5e7eab99e2d3b660df6efc9f7c32beb53a2558b4659f8c9d474e7cd3a9250ea2d996d2066893c162c45c4 WHIRLPOOL 153b537f51e75f6fafef107b9b9fe3297845546f80beb2e09cdbec99ab5e1a3a96e147aa00d79f1e9e50bc56708ea43eb14b000b434a0ca06e1cbe1c05809bde
-EBUILD python-exec-2.0.1-r1.ebuild 1153 SHA256 58f297a09dc982503090a08b58675e35dcdc90a0fbc7c472f83f6cd567a3ecec SHA512 b9ed372715c97cd0402cf0d8f97d6b7efd734b0706ec9976ae75f71425b67c54c359cf5e4e35a94738b2d9d77fcf9d1eae84b10858b834fd63dbee3c4b7d90bd WHIRLPOOL 18613d2a91545731f5ce74480844c27504ce4bfa1838ef38b5360a234b32991ab8f33fec39b7c2285c910852266ac509a8503c094ae11b54e174d385240a429f
-EBUILD python-exec-2.9999.ebuild 1339 SHA256 ae09ec2335545f41de7f63eadb445f5a6a9699487d22c4ddd6f13a392d9faa9a SHA512 eb5cb3fbe71dbd7340dda65e1cd6716255dc85a9add42c421f144ee778903c5b79d74b96997b977a5abe8358d85dda9c70e41e8ead5aa1ed514b8c09b4534346 WHIRLPOOL 7839fc08ae4011850250e9180fae2437a6fd052bfaa73e0f84a8932466ea26bf91b171afa3032f3c2e50bc80820555693482bbcb91d73dd2ebc6a68a1a9a6255
-MISC ChangeLog 3338 SHA256 b02257ede909133b8cd9e885dc28fb79290b2b72f0d13613db78f573da60adb9 SHA512 c2ae18e253e826f68058e4e1a504a987a70140f717c9b0e148d2e4109aacfd77a97bbc18c1d8bd0dd75a1b8ebd26d8dc601383692a5eccff5ab008e9701de07c WHIRLPOOL 2b9c9a7c3b84da8856aaac0e9854e684a20247094b77a74a823e80be88491081752c04efbe4fd293e3567a89efb1c8ce09e37e78851cf03e992b935af45f4dfc
-MISC metadata.xml 369 SHA256 8b6dcc8bc5a5198e3df4c844ebf07234f8c9eb1ff4e10fa7bccc07a0e5dc7517 SHA512 8cc3738e0fd501a4b374d9e18f5676c78d285549c88061aab63697011f43163275751341dc1199aa9a0e4eb3bc9c8e436df261ede8bcf2f759aab096a53d04e0 WHIRLPOOL c99edc69d860d148ebd3d004131e448a957a1f6a3cb3f32b51e94bed79eee6060e41f0de18edc6dd63b83f507f25ab6f0105e593d7d14b1050106aaa3b45e342
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJTuUzCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVi4P/RH+dI6sOolCoIepwYw6yJjo
-wlevDQg9urGGhv25KaS9e68mXEw0iNSsbmYlBaVy/0jDDojWe2lQ/zq9QYuM6E4s
-1yBNkAo75D8iHBnzHT90BU0yWbg2NsbOoing5Z6KJJ2/lwurlk2ReVlBkdLlW+mZ
-mNiO54SvXUI7pb9pIshkWNMP5UXjAaIXZja1vQGRmn2GWwvwoUpcCrkovTaY4jYq
-6LlZdh7S4N12Hc9FYDEYPBgw3hvqUqSNWt0MUIOskmHAo3GCoj9nZqX0EEHwHd0u
-0gyaR7wBbtGcUnK8c3ySfPOi6gSq5r9fI6rBWAb1p25JWmh6aWsh8Gm76C7jKy9l
-8S63yKxnTJVg5yrVroL/y7xokyhRoM5G8Heb0tUdRse4r+Krk/4xJR3wGnMTRKLI
-TELCzUoggGM6hJMtJLnfuFTJ1HD3gQh04gse2QDDhQPyICwf1gVHjjFdu1le3aMK
-5JPsOiP0KZeDHmaUBoCqDEPBQ4XitT/3QhmfUjrd72Z4MnVDNNBPSIRiNpuaP5m+
-CEoYG/AZubJ2S/FIQnMd7u7NXwuH8hCBH3V8LpzoK8XkrsYrqjpyTI+5ttDXeWf2
-5wobK8eD+R67M0JmOB0BjTsJ2mxLDK36vq8MCzQh5VaFoMQYdrBSnZNWcnNtm2H2
-plHdPeqiHyenf6Fbtrym
-=nvBn
------END PGP SIGNATURE-----
+DIST python-exec-2.0.2.tar.bz2 82217 SHA256 c411638fe94953c1e8ff57e7b66f601a817633fbc9cb7d410982778042051bb0 SHA512 96198dda88a73b902d617a32f10ddf2ac981b1871fb5eaf5003d77453df8a0aacf299c39c6e49ebaa620994a30e57ee7a1128fb4ba41aa4f503031fa2addef7f WHIRLPOOL 603b494c7b87f0f3f0cfba35378e1a2e231879a01b730657e09ecf798957fa4dfd54a6d852074c2aa9ae3c15e5d1d3203584b8a120e5dd0dee2117319706a5ce
+DIST python-exec-2.1.tar.bz2 82167 SHA256 adac4e9ae677ca0fbb9efc55573ecbb0e8361ed7a60a5241e7abc1056fba06ad SHA512 cadfb7723aa412caec4a449909769b14a800c19650c64768b0ffb30b2c0645e70c9a039f960f3263c6c18490bb73c0129b83a72c7407f558bcaf3652cc4c8bcf WHIRLPOOL 72b73b216faf7caa8afbc3ce316771bd832e468cf84835267dc3833d5c52fce24578e09f2d3aa8a322f324426eda5e53bd9611711ea976679574b2be764c2525
+DIST python-exec-2.4.3.tar.bz2 86815 SHA256 581aa0c033632269d553754440d4017c21afc1c1500fd8951de093bc715c63fb SHA512 37fb7f915a2848699e9fca4e09d167b6d6aa192e3c374d7f01aec09529b5f1346ce2c45139f4e8f68b53e3f197b4d77b7f58519b012c117dd5ec8535a43fbe34 WHIRLPOOL 117564deb6f35387757ebbbff96d0325d5979d2933bbfca184cde0170cdd923bf9fa71ba76f234b098df12f006b6f8b5ba388416692ceff56ec7c16173777ab6
+DIST python-exec-2.4.4.tar.bz2 86945 SHA256 cdc780764bce79047ab047160156c5dc3bf5728d9c59cf1ed904fdf12638d60b SHA512 26b76960430dc3b2b79aab5e8a72498144d4e78bed5291fe9361afe081f0e8d70049a74ec29384cb0fc199f76c23499324d2eddcaea521ef33d88e61b1b674f9 WHIRLPOOL 791fd9732179d17bf5cd981956759e7c25e1e1dcbaf6fdfb05cf4fed8d4f44490740aaa5b4d38335a72128f8fdea0f6ab2e34c331a2b7f6b0897aa7eaa1f0c48
+EBUILD python-exec-2.0.1-r1.ebuild 1040 SHA256 677933eddddd9fa749a0cb9120b899b3344ebb8245ae9d92e02dc4fe9afd4911 SHA512 d48b579d23ea8419a2f187d00d10db17e9b7eeb419de3647ef189431616bd88c99818ecfc266a0c5a05681ccb5fd981682a6b0513e74e8caa0ac85728772a93b WHIRLPOOL 94a7c4bee0442beadcf0823312669405353d765cf8e689126c11c8148e04288ae506d062bda34e55f8ba9b552cfeb1d107e1b13b2d800fb1b08b400c0849dbf0
+EBUILD python-exec-2.0.2.ebuild 1040 SHA256 5674a796355dd3dd40dbdfaac309677506efd999a8ec37e0e2c0a3a12d1b79c2 SHA512 b1868daf3e24badb91c9c24acd631cc72dd81acb20f4418f1e7a944d71757b9e0af4f84e2fcc87d85144125ad89582f4345c538837d7674504269f769b1993b6 WHIRLPOOL ea0591aee261b6a9947dfe2f4ced24aac01dfddbfc66e1b1f56859795ca029099a77cd09bbe07137e092a35fdee30807bebfa6675eff2e064363a22175eb023a
+EBUILD python-exec-2.1.ebuild 1188 SHA256 2238c0ccaa921db68601172fa9110a3601522100e7ad715532bb3663efa8ba0c SHA512 d65782c09fdbb43b8458c96dfecdf165cb54b1605d9d3397a6da3d3dab29ce23f36bd181bc5616511af103fe25a840ad36cad83fad71f3b3d6064670c75ed50d WHIRLPOOL 5c36fc3ca5ffa425b7e733e9c144d6ab01fd42f5832dff2414c215d92cf4e6df14b7636cc7840bd43662b20292d56d57082b5620780706587e9687ee1f158955
+EBUILD python-exec-2.4.3.ebuild 4330 SHA256 3f0fd729473db2db53fde07ec8dda59fccda3635bae557f294b74efacbece973 SHA512 5047ce61d689905edd334e5ff1f46d3b586ab820e1c093fbfe2b73a905cf83054362a767596de4cf8483f12b9ef51bdffd2db4c24badeb104d689fdf598ff411 WHIRLPOOL e613cfe112099a5ef28670e56408eedfb42df6ead62d0956839e2bccace5ed5b8cd70784b0b4d9bd37368f48b3795590815cf3fbcb813c9fae32255a1f6c826a
+EBUILD python-exec-2.4.4.ebuild 4321 SHA256 ba0e1cb801749b124147fd1cfff59b1228e5ccd44cc4440811e8a995822f18ac SHA512 82afcaa43b6b5813a94e6f578563bdbe3fed543b8b1908fcd5d506b061b7e597ee95ef0d9bba204b77e32382d0a4e32fd676ed2762866a152fdeacf1cd75af14 WHIRLPOOL b15ca49be61f58c44a0afad4dc9986262abedd25741090a2a84a7da45b85b9bb8725d60d130afbdaf83b452c9fd7a263098fbe4e1475ebf762fc213391a8f6be
+EBUILD python-exec-9999.ebuild 4493 SHA256 137eed25e6b43dead89c1c4cb24466e62d724ee55855d4c91efc8c647a7919cd SHA512 ec41744160a7917ffc086ced6592eb919302b5cfe2fbf04a108817d3e55a9dad51dcce583d683383ad28a6f8e3602fcb4554f6cd6f70148096da87a67b48f9d9 WHIRLPOOL e49a9eca5f9ad0358d2b0d525c057a23d7e10212509493751bfc60a2a455ef18e5318adfb5995a489b5bdf57a89315fd6d4d544fe670bb6e92955d1c5ad0ad9b
+MISC ChangeLog 10720 SHA256 3d82f9b81fc855db286b1fc912731759c811815c348046491edef317e22d29e4 SHA512 6eed75de98c71ac6e81eae8607405efb133472936ec613a2ba70ead54eda3839a8b4b50dbca78325cfa9d0c2fe4b5a0de791dd19d1ac0349787b0865f6cd0715 WHIRLPOOL 636aab31ec2d766cb177b25734dd245e30262870e1837ea8eabcb71dfb02e6a89a3bc54ed03e6a3b6cc83df8ae9ec8721a266f9945cfdc227ee36e3a1811e422
+MISC ChangeLog-2015 3848 SHA256 5f99d4b5e2ae61ae1330ac7a10f56d3fae902ef2a2a52de9b07383197c57e71f SHA512 e516a7461f0d8008c7554858bb9d490db05768d90c5f237a6ca9e8c4a0902bc9205f389c7dab410ed0a48689dd774012487340954eb9c19873fa0b2608d871e2 WHIRLPOOL c6551fd2ced06008adf39300cf22953fd13129cd4291b3f9c49d12bda3bc809daf010997de7b7a643fadfeafe7324e869975a1a42aa7c6450465377ab1117fb3
+MISC metadata.xml 529 SHA256 3b9edc78a1d04691c7dcbc9a848d150c58be99ab3a884ac5bf74266401278522 SHA512 3483112d6662461c2800bbd5722ef47f13477c2ca4d744e84d6cf54a3eb9e244271678989ac827bbd5f6f59f7fd3e467ef8bc05fba770b56057016d70a09e398 WHIRLPOOL e60263b0c27cc02a01d448503962e889fb35e2408cfd12d0b6faca5a2a572a7ca32d354f59b532d705c1ff1f655ff075c822f3f2fd74aed23459ac6b0fd3964e
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/metadata.xml
index 6f5434d62c..edb96f5bbb 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://bitbucket.org/mgorny/python-exec/issues/</bugs-to>
-	</upstream>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+    </maintainer>
+    <bugs-to>https://github.com/mgorny/python-exec/issues/</bugs-to>
+    <remote-id type="bitbucket">mgorny/python-exec</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild
index f7996dd2e0..9f61668c91 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild,v 1.2 2014/07/06 13:18:50 mgorny Exp $
+# $Id$
 
 EAPI=5
 
@@ -11,8 +11,8 @@ PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
 inherit autotools-utils python-r1
 
 DESCRIPTION="Python script wrapper"
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="2"
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-0.3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.0.2.ebuild
similarity index 74%
rename from sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-0.3.1-r1.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.0.2.ebuild
index 273e0ee503..531424ea49 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-0.3.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python-exec/python-exec-0.3.1-r1.ebuild,v 1.2 2014/07/06 13:18:50 mgorny Exp $
+# $Id$
 
 EAPI=5
 
@@ -11,11 +11,11 @@ PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
 inherit autotools-utils python-r1
 
 DESCRIPTION="Python script wrapper"
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
-SLOT="0"
+SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-0.9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.1.ebuild
similarity index 50%
rename from sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-0.9999.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.1.ebuild
index e0dfead13e..4b4d2ac271 100644
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-0.9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.1.ebuild
@@ -1,49 +1,40 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python-exec/python-exec-0.9999.ebuild,v 1.6 2014/07/06 13:18:50 mgorny Exp $
+# $Id$
 
 EAPI=5
 
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
-
-inherit git-r3
-#endif
-
 # Kids, don't do this at home!
 inherit python-utils-r1
 PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
 
-inherit autotools-utils python-r1
+# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
+# dependencies and trigger necessary rebuilds.
+inherit python-r1
 
 DESCRIPTION="Python script wrapper"
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="!<dev-python/python-exec-10000"
-
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
+RDEPEND="!<dev-python/python-exec-10000
+	!<app-eselect/eselect-python-20151117"
 
 src_configure() {
-	local pyimpls i EPYTHON
+	local pyimpls=() i EPYTHON
 	for i in "${PYTHON_COMPAT[@]}"; do
 		python_export "${i}" EPYTHON
-		pyimpls+=" ${EPYTHON}"
+		pyimpls+=( "${EPYTHON}" )
 	done
 
-	local myeconfargs=(
+	local myconf=(
 		--with-eprefix="${EPREFIX}"
-		--with-python-impls="${pyimpls}"
+		--with-python-impls="${pyimpls[*]}"
 	)
 
-	autotools-utils_src_configure
+	econf "${myconf[@]}"
 }
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.3.ebuild
new file mode 100644
index 0000000000..1db43aaa11
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Kids, don't do this at home!
+inherit python-utils-r1
+PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
+
+# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
+# dependencies and trigger necessary rebuilds.
+inherit python-r1
+
+DESCRIPTION="Python script wrapper"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# eselect-python because of /usr/bin/python* collisions and new config
+# python versions because of missing $scriptdir/python* symlinks
+RDEPEND="
+	!<app-eselect/eselect-python-20160206
+	!<dev-lang/python-2.7.10-r4:2.7
+	!<dev-lang/python-3.3.5-r4:3.3
+	!<dev-lang/python-3.4.3-r4:3.4
+	!<dev-lang/python-3.5.0-r3:3.5"
+
+src_configure() {
+	local pyimpls=() i EPYTHON
+	for i in "${PYTHON_COMPAT[@]}"; do
+		python_export "${i}" EPYTHON
+		pyimpls+=( "${EPYTHON}" )
+	done
+
+	local myconf=(
+		--with-python-impls="${pyimpls[*]}"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Prepare and own the template
+	sed -n -e '/^#/p' config/python-exec.conf.example \
+		> "${T}"/python-exec.conf || die
+	insinto /etc/python-exec
+	doins "${T}"/python-exec.conf
+
+	local f
+	for f in python{,2,3}; do
+		# symlink the C wrapper for python to avoid shebang recursion
+		# bug #568974
+		dosym python-exec2c /usr/bin/"${f}"
+	done
+	for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do
+		# those are python scripts (except for new python-configs)
+		# so symlink them via the python wrapper
+		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
+	done
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then
+		# preserve current configuration
+		cp "${EROOT}"etc/python-exec/python-exec.conf \
+			"${ED}"etc/python-exec/python-exec.conf || die
+	else
+		# preserve previous Python version preference
+		local py old_pythons=()
+		local config_base=${EROOT}etc/env.d/python
+
+		# start with the 'global' preference (2 vs 3)
+		if [[ -f ${config_base}/config ]]; then
+			old_pythons+=( "$(<${config_base}/config)" )
+		fi
+
+		# then try specific py3 selection
+		for py in 3; do
+			local target=
+
+			if [[ -f ${config_base}/python${py} ]]; then
+				# try the newer config files
+				target=$(<${config_base}/python${py})
+			elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then
+				# check the older symlink format
+				target=$(readlink "${EROOT}/usr/bin/python${py}")
+
+				# check if it's actually old eselect symlink
+				[[ ${target} == python?.? ]] || target=
+			fi
+
+			# add the extra target if found and != global
+			if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then
+				old_pythons+=( "${target}" )
+			fi
+		done
+
+		if [[ ${old_pythons[@]} ]]; then
+			elog "You seem to have just upgraded into the new version of python-exec"
+			elog "that uses python-exec.conf for configuration. The ebuild has attempted"
+			elog "to convert your previous configuration to the new format, resulting"
+			elog "in the following preferences (most preferred version first):"
+			elog
+			for py in "${old_pythons[@]}"; do
+				elog "  ${py}"
+			done
+			elog
+			elog "Those interpreters will be preferred when running Python scripts or"
+			elog "calling wrapped Python executables (python, python2, pydoc...)."
+			elog "If none of the preferred interpreters are supported, python-exec will"
+			elog "fall back to the newest supported Python version."
+			elog
+			elog "Please note that due to the ambiguous character of the old settings,"
+			elog "you may want to modify the preference list yourself. In order to do so,"
+			elog "open the following file in your favorite editor:"
+			elog
+			elog "  ${EROOT}etc/python-exec/python-exec.conf"
+			elog
+			elog "For more information on the new configuration format, please read"
+			elog "the comment on top of the installed configuration file."
+
+			local IFS=$'\n'
+			echo "${old_pythons[*]}" \
+				>> "${ED}"etc/python-exec/python-exec.conf || die
+		fi
+	fi
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.4.ebuild
new file mode 100644
index 0000000000..5e183a1e5b
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.4.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Kids, don't do this at home!
+inherit python-utils-r1
+PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
+
+# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
+# dependencies and trigger necessary rebuilds.
+inherit python-r1
+
+DESCRIPTION="Python script wrapper"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# eselect-python because of /usr/bin/python* collisions and new config
+# python versions because of missing $scriptdir/python* symlinks
+RDEPEND="
+	!<app-eselect/eselect-python-20160206
+	!<dev-lang/python-2.7.10-r4:2.7
+	!<dev-lang/python-3.3.5-r4:3.3
+	!<dev-lang/python-3.4.3-r4:3.4
+	!<dev-lang/python-3.5.0-r3:3.5"
+
+src_configure() {
+	local pyimpls=() i EPYTHON
+	for i in "${PYTHON_COMPAT[@]}"; do
+		python_export "${i}" EPYTHON
+		pyimpls+=( "${EPYTHON}" )
+	done
+
+	local myconf=(
+		--with-python-impls="${pyimpls[*]}"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Prepare and own the template
+	sed -n -e '/^#/p' config/python-exec.conf.example \
+		> "${T}"/python-exec.conf || die
+	insinto /etc/python-exec
+	doins "${T}"/python-exec.conf
+
+	local f
+	for f in python{,2,3}; do
+		# symlink the C wrapper for python to avoid shebang recursion
+		# bug #568974
+		dosym python-exec2c /usr/bin/"${f}"
+	done
+	for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do
+		# those are python scripts (except for new python-configs)
+		# so symlink them via the python wrapper
+		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
+	done
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then
+		# preserve current configuration
+		cp "${EROOT}"etc/python-exec/python-exec.conf \
+			"${ED}"etc/python-exec/python-exec.conf || die
+	else
+		# preserve previous Python version preference
+		local py old_pythons=()
+		local config_base=${EROOT}etc/env.d/python
+
+		# start with the 'global' preference (2 vs 3)
+		if [[ -f ${config_base}/config ]]; then
+			old_pythons+=( "$(<${config_base}/config)" )
+		fi
+
+		# then try specific py3 selection
+		for py in 3; do
+			local target=
+
+			if [[ -f ${config_base}/python${py} ]]; then
+				# try the newer config files
+				target=$(<${config_base}/python${py})
+			elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then
+				# check the older symlink format
+				target=$(readlink "${EROOT}/usr/bin/python${py}")
+
+				# check if it's actually old eselect symlink
+				[[ ${target} == python?.? ]] || target=
+			fi
+
+			# add the extra target if found and != global
+			if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then
+				old_pythons+=( "${target}" )
+			fi
+		done
+
+		if [[ ${old_pythons[@]} ]]; then
+			elog "You seem to have just upgraded into the new version of python-exec"
+			elog "that uses python-exec.conf for configuration. The ebuild has attempted"
+			elog "to convert your previous configuration to the new format, resulting"
+			elog "in the following preferences (most preferred version first):"
+			elog
+			for py in "${old_pythons[@]}"; do
+				elog "  ${py}"
+			done
+			elog
+			elog "Those interpreters will be preferred when running Python scripts or"
+			elog "calling wrapped Python executables (python, python2, pydoc...)."
+			elog "If none of the preferred interpreters are supported, python-exec will"
+			elog "fall back to the newest supported Python version."
+			elog
+			elog "Please note that due to the ambiguous character of the old settings,"
+			elog "you may want to modify the preference list yourself. In order to do so,"
+			elog "open the following file in your favorite editor:"
+			elog
+			elog "  ${EROOT}etc/python-exec/python-exec.conf"
+			elog
+			elog "For more information on the new configuration format, please read"
+			elog "the comment on top of the installed configuration file."
+
+			local IFS=$'\n'
+			echo "${old_pythons[*]}" \
+				>> "${ED}"etc/python-exec/python-exec.conf || die
+		fi
+	fi
+}
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.9999.ebuild
deleted file mode 100644
index 7a023a0f16..0000000000
--- a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-2.9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python-exec/python-exec-2.9999.ebuild,v 1.6 2014/07/06 13:18:50 mgorny Exp $
-
-EAPI=5
-
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
-EGIT_BRANCH="python-exec2"
-
-inherit git-r3
-#endif
-
-# Kids, don't do this at home!
-inherit python-utils-r1
-PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
-
-inherit autotools-utils python-r1
-
-DESCRIPTION="Python script wrapper"
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<dev-python/python-exec-10000"
-
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
-
-src_configure() {
-	local pyimpls i EPYTHON
-	for i in "${PYTHON_COMPAT[@]}"; do
-		python_export "${i}" EPYTHON
-		pyimpls+=" ${EPYTHON}"
-	done
-
-	local myeconfargs=(
-		--with-eprefix="${EPREFIX}"
-		--with-python-impls="${pyimpls}"
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-9999.ebuild
new file mode 100644
index 0000000000..c130a90f54
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/python-exec/python-exec-9999.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#if LIVE
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
+
+inherit autotools git-r3
+#endif
+
+# Kids, don't do this at home!
+inherit python-utils-r1
+PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
+
+# Inherited purely to have PYTHON_TARGET flags which will satisfy USE
+# dependencies and trigger necessary rebuilds.
+inherit python-r1
+
+DESCRIPTION="Python script wrapper"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# eselect-python because of /usr/bin/python* collisions and new config
+# python versions because of missing $scriptdir/python* symlinks
+RDEPEND="
+	!<app-eselect/eselect-python-20160206
+	!<dev-lang/python-2.7.10-r4:2.7
+	!<dev-lang/python-3.3.5-r4:3.3
+	!<dev-lang/python-3.4.3-r4:3.4
+	!<dev-lang/python-3.5.0-r3:3.5"
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+
+src_prepare() {
+	eautoreconf
+}
+#endif
+
+src_configure() {
+	local pyimpls=() i EPYTHON
+	for i in "${PYTHON_COMPAT[@]}"; do
+		python_export "${i}" EPYTHON
+		pyimpls+=( "${EPYTHON}" )
+	done
+
+	local myconf=(
+		--with-python-impls="${pyimpls[*]}"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Prepare and own the template
+	sed -n -e '/^#/p' config/python-exec.conf.example \
+		> "${T}"/python-exec.conf || die
+	insinto /etc/python-exec
+	doins "${T}"/python-exec.conf
+
+	local f
+	for f in python{,2,3}; do
+		# symlink the C wrapper for python to avoid shebang recursion
+		# bug #568974
+		dosym python-exec2c /usr/bin/"${f}"
+	done
+	for f in python{,2,3}-config 2to3 idle pydoc pyvenv; do
+		# those are python scripts (except for new python-configs)
+		# so symlink them via the python wrapper
+		dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
+	done
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}etc/python-exec/python-exec.conf ]]; then
+		# preserve current configuration
+		cp "${EROOT}"etc/python-exec/python-exec.conf \
+			"${ED}"etc/python-exec/python-exec.conf || die
+	else
+		# preserve previous Python version preference
+		local py old_pythons=()
+		local config_base=${EROOT}etc/env.d/python
+
+		# start with the 'global' preference (2 vs 3)
+		if [[ -f ${config_base}/config ]]; then
+			old_pythons+=( "$(<${config_base}/config)" )
+		fi
+
+		# then try specific py3 selection
+		for py in 3; do
+			local target=
+
+			if [[ -f ${config_base}/python${py} ]]; then
+				# try the newer config files
+				target=$(<${config_base}/python${py})
+			elif [[ -L ${EROOT}/usr/bin/python${py} ]]; then
+				# check the older symlink format
+				target=$(readlink "${EROOT}/usr/bin/python${py}")
+
+				# check if it's actually old eselect symlink
+				[[ ${target} == python?.? ]] || target=
+			fi
+
+			# add the extra target if found and != global
+			if [[ ${target} && ${old_pythons[0]} != ${target} ]]; then
+				old_pythons+=( "${target}" )
+			fi
+		done
+
+		if [[ ${old_pythons[@]} ]]; then
+			elog "You seem to have just upgraded into the new version of python-exec"
+			elog "that uses python-exec.conf for configuration. The ebuild has attempted"
+			elog "to convert your previous configuration to the new format, resulting"
+			elog "in the following preferences (most preferred version first):"
+			elog
+			for py in "${old_pythons[@]}"; do
+				elog "  ${py}"
+			done
+			elog
+			elog "Those interpreters will be preferred when running Python scripts or"
+			elog "calling wrapped Python executables (python, python2, pydoc...)."
+			elog "If none of the preferred interpreters are supported, python-exec will"
+			elog "fall back to the newest supported Python version."
+			elog
+			elog "Please note that due to the ambiguous character of the old settings,"
+			elog "you may want to modify the preference list yourself. In order to do so,"
+			elog "open the following file in your favorite editor:"
+			elog
+			elog "  ${EROOT}etc/python-exec/python-exec.conf"
+			elog
+			elog "For more information on the new configuration format, please read"
+			elog "the comment on top of the installed configuration file."
+
+			local IFS=$'\n'
+			echo "${old_pythons[*]}" \
+				>> "${ED}"etc/python-exec/python-exec.conf || die
+		fi
+	fi
+}
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-0.9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-0.9999
deleted file mode 100644
index 604ff974c4..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-0.9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Python script wrapper
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/python-exec/
-IUSE=python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-LICENSE=BSD-2
-RDEPEND=!<dev-python/python-exec-10000
-SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=137f42a6e757287fe19085bc0ca5ef77
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.0.1-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.0.1-r1
index 1035381bf4..1642519173 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.0.1-r1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.0.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python script wrapper
 EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/python-exec/
+HOMEPAGE=https://github.com/mgorny/python-exec/
 IUSE=python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=!<dev-python/python-exec-10000
 SLOT=2
-SRC_URI=https://www.bitbucket.org/mgorny/python-exec/downloads/python-exec-2.0.1.tar.bz2
+SRC_URI=https://github.com/mgorny/python-exec/releases/download/python-exec-2.0.1/python-exec-2.0.1.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=d842043fe573a19cac6965922d598bbd
+_md5_=a2f8460639fd893cc621136ed90a3adb
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-0.3.1-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.0.2
similarity index 83%
rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-0.3.1-r1
rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.0.2
index b2a069f894..961ad46c01 100644
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-0.3.1-r1
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.0.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python script wrapper
 EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/python-exec/
+HOMEPAGE=https://github.com/mgorny/python-exec/
 IUSE=python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=!<dev-python/python-exec-10000
-SLOT=0
-SRC_URI=https://www.bitbucket.org/mgorny/python-exec/downloads/python-exec-0.3.1.tar.bz2
+SLOT=2
+SRC_URI=https://github.com/mgorny/python-exec/releases/download/python-exec-2.0.2/python-exec-2.0.2.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=15d6cbc802ffb55dd3eb2a8d27c357fb
+_md5_=053f2c084f21397b5afd85f323844cd5
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.1
new file mode 100644
index 0000000000..b7cd0e0e9e
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Python script wrapper
+EAPI=5
+HOMEPAGE=https://github.com/mgorny/python-exec/
+IUSE=python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=!<dev-python/python-exec-10000 !<app-eselect/eselect-python-20151117
+SLOT=2
+SRC_URI=https://github.com/mgorny/python-exec/releases/download/python-exec-2.1/python-exec-2.1.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=60a27d72f7b1d9143ca344b92db0deaf
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.4.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.4.3
new file mode 100644
index 0000000000..e8f04df769
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.4.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install preinst
+DESCRIPTION=Python script wrapper
+EAPI=5
+HOMEPAGE=https://github.com/mgorny/python-exec/
+IUSE=python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=!<app-eselect/eselect-python-20160206 !<dev-lang/python-2.7.10-r4:2.7 !<dev-lang/python-3.3.5-r4:3.3 !<dev-lang/python-3.4.3-r4:3.4 !<dev-lang/python-3.5.0-r3:3.5
+SLOT=2
+SRC_URI=https://github.com/mgorny/python-exec/releases/download/python-exec-2.4.3/python-exec-2.4.3.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=46833f004eade2b5a9db9abc45bf2334
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.4.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.4.4
new file mode 100644
index 0000000000..cd65a23ffd
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.4.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install preinst
+DESCRIPTION=Python script wrapper
+EAPI=5
+HOMEPAGE=https://github.com/mgorny/python-exec/
+IUSE=python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=!<app-eselect/eselect-python-20160206 !<dev-lang/python-2.7.10-r4:2.7 !<dev-lang/python-3.3.5-r4:3.3 !<dev-lang/python-3.4.3-r4:3.4 !<dev-lang/python-3.5.0-r3:3.5
+SLOT=2
+SRC_URI=https://github.com/mgorny/python-exec/releases/download/python-exec-2.4.4/python-exec-2.4.4.tar.bz2
+_eclasses_=eutils	9d81603248f2ba3ec59124320d123e5e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=c936eb4f4087ebdeeb86ba5bb689eae2
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.9999
deleted file mode 100644
index 34d3336e80..0000000000
--- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-2.9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Python script wrapper
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/python-exec/
-IUSE=python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-LICENSE=BSD-2
-RDEPEND=!<dev-python/python-exec-10000
-SLOT=2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=78bf295dde686fa95c2cef0cfd245f8b
diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-9999
new file mode 100644
index 0000000000..4fed779098
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-lang/python-exec-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install preinst prepare unpack
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Python script wrapper
+EAPI=5
+HOMEPAGE=https://github.com/mgorny/python-exec/
+IUSE=python_targets_jython2_7 python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+LICENSE=BSD-2
+RDEPEND=!<app-eselect/eselect-python-20160206 !<dev-lang/python-2.7.10-r4:2.7 !<dev-lang/python-3.3.5-r4:3.3 !<dev-lang/python-3.4.3-r4:3.4 !<dev-lang/python-3.5.0-r3:3.5
+SLOT=2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	9d81603248f2ba3ec59124320d123e5e	git-r3	ef66dfc3db09f327af21cf32f140fb2b	libtool	b75230758539a7da029e24afdb693960	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	3972ca401cf7dbb430df9995f5d8d580	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	2e6826f6a93ad2acf904eecf5b5fb6d2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=77010b48f27fed4bdc57cdb39dad4924