Update for new binary builds, thanks to Alice.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 523 insertions, 16 deletions

diff --git a/dev-python/pypy-bin/ChangeLog b/dev-python/pypy-bin/ChangeLog
index 8d17b025ef46..23a35e937399 100644
--- a/dev-python/pypy-bin/ChangeLog
+++ b/dev-python/pypy-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pypy-bin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.20 2014/07/06 13:18:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.21 2014/07/12 21:27:07 mgorny Exp $
+
+*pypy-bin-2.3.1 (12 Jul 2014)
+
+  12 Jul 2014; Michał Górny <mgorny@gentoo.org>
+  +files/2.3-21_all_distutils_c++.patch, +pypy-bin-2.3.1.ebuild:
+  Update for new binary builds, thanks to Alice.
 
   06 Jul 2014; Michał Górny <mgorny@gentoo.org> pypy-bin-2.0.2-r1.ebuild,
   pypy-bin-2.2.1-r1.ebuild:
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 4d5e6e204dd8..30d4f2fdc32c 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -5,8 +5,10 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5
 AUX 1.9-scripts-location.patch 394 SHA256 d02ef738b6c82a7a671b50bdc5dc623887e97c3cb033c11ea997b88e6ccb8bdc SHA512 4566ff947ad79c1ab71fbe5999f262d045271e4ae30962ff93de0bf58d592b2d20b996ae6f6fea2139eeb2391fb33357ec9ecde2e600bad593901b391918d1f7 WHIRLPOOL 963306d68bb5d82d13da54452cbc824c82c1e45aa8eb9ff5dff8bc702b789dfbdb1f6b25daa2f40876a6dbf53a38dc61251dbb2386feb2abb38f64e6652aa239
 AUX 2.0.2-distutils-fix_handling_of_executables_and_flags.patch 15206 SHA256 0e0c1ad3971abf7318c6add811caff2b755ea0e42397cfd92611d47668cf82b4 SHA512 965a10eb8de03d78d4a0b2a0dc23a5f8b9dd54ce42ef0f975cb26ef3de8c07b92f4ca1f415d41156aae3b9d0ce97b27912f7d10b06c24d2f44b371df66613fde WHIRLPOOL b830af87d2881dbf23df89980b3aed0089a4ffa38ebd99b1d93608cf5482377a7d6680a3b446227bae9f9357bbd8c814f4d083f0a057de98faf81522c3dcf15e
 AUX 2.1-distutils-fix_handling_of_executables_and_flags.patch 15045 SHA256 7f93949bc00a225694e9f106eade2057f12c4d0f34341e47a98ef7a4323884ed SHA512 b76a980b0bd3db8b01d12f8f16d147b446bef08bd98e8874ea4fb5304e28f443a69763a442e3ccffd130600d3b0f4e895aff0a2b875059597bb74e1b3aed3889 WHIRLPOOL 8d093a952696b4e6fbbc15f10aa6890db2928bc3de8f65dadc6812a334289233a1e4c8202e1dea13238dee2a5722e7e0c9f2e7557aff88f0204a890058f79afa
+AUX 2.3-21_all_distutils_c++.patch 14825 SHA256 99fc72d254a903a5445c991ac5e1f7ab95d1df6dde684250e145bd908131ebda SHA512 8b53016ae48cae39e9fee030fa18b9cebb72bf72b180be1a0a605a97ab6a0ad62d32317f459728a324f83179ec624885bd3cbe61ac0b5594690cca0c0e74c76e WHIRLPOOL 6718f3e998f0d7174e7088881c74d0e2063e935b5610e076eaf2233ee84f6478c0a1689f5d01de9aeb8f53a97ed73fb4957de16be4adc83045b21c48b93e8646
 DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
 DIST pypy-2.2.1-src.tar.bz2 14439822 SHA256 252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f SHA512 68b52c5b1a9b96593aa1dd38ad0b1b7b282852008e3ae3c488a5e19ab2bede68e2b40afdb79d85a4ab21cb1da6647b8b958fcefe34c99a1f6cbc1a19d695d3b6 WHIRLPOOL 6eca63959d8ee5663f868daaaac32ad1180b07e2f8b63d839652902095a098ffbfa29c6f83451733270a4b2f73b65450cb3b80a878b9dd1ec71089bfff11e9f6
+DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 SHA512 86aab86c5f413cdd6a56680915605de5c1416255b43a8dce1b4dcf8f1febdb3275076a4a9c7de30002387d59e4171a52da2528436eb205d8d947de7edd049c65 WHIRLPOOL c78d41240f1803d9461f797fd0ef647a40a6990a4e3a504e80a0eaaf460d052bb60fe6240cacdb3ee8737500c9c7f418b1d55c619d01ac7b73aace3d82157aa6
 DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 9652340 SHA256 100c1119fe08c47d1a15ca6c98b91c510f41c670d87526fb392e3b292d791ac3 SHA512 ac8d91e740fc8a49860ec47717b160a59ac68807aabd8ddc3a578682d6d75d3ddd47bc5e8b7db6e2be0af5f9414596831372225ab657194ba72d22c2360f98c0 WHIRLPOOL 5dc07128fc8db9df062053803a2792eb6f3795cf2cdef5d011a594c73a158bb4061fcd862c39eb074805f0b4e46d0846708f3fd0fdf3464b02cbe8efa406bb1f
 DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses.tar.xz 10469416 SHA256 4f8a64d8cc679b8ba6751fc47307df679bca2658848d009c8c724682c76fbf0a SHA512 1d1bedc80d12982074a09516674bee71e57bac9b2b9dac1d9834295edb3b8fb79c0e93de708eef0dbf232dd198a4a728b09a9f86ab5dabad8a293072446b2a2b WHIRLPOOL 08753da5e1e6361bd21b03813cb4482164cc2933d8bf2a2d7443379b1be1b6ac0b87fde571af8519e7fa9e14893bb570799ad6dae02ba42a936dc4d964b0e821
 DIST pypy-bin-2.0.2-amd64+bzip2+ncurses.tar.xz 6527192 SHA256 ff2ac88da94978388b20d54b0a2add839facc5e605c54cc7bfd96faa088ec266 SHA512 58b9e6acc9038b4aeccadf0f1dd257b320cca8e536edd2835c0d9b95f27268b3b71e3af59daa4033580f2fc43f590205e1ed6de2fe475c60cf00c1a781ad1f86 WHIRLPOOL b5410e2b7a0816dffb64b32169be82193820c345d5b4000dc3fd8f827ce82a783fe62605efc0be7794d38dbdeb59d68cf0ac46c62f24f4a8025a2506739db4d1
@@ -21,26 +23,34 @@ DIST pypy-bin-2.2.1-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 7789720 SHA
 DIST pypy-bin-2.2.1-r1-x86+bzip2+jit+ncurses+sse2.tar.xz 8981480 SHA256 e965e343bf5e43c2f21e1bb9317a22f06ebc07c57127ffdb6ed5a9768a834e0e SHA512 1731aa4db600fb5cf79f17607a0e68321c5be5d969acafa249708e9b91a3f4b5fcde96a64c85f2fbd8977ccae288e3e9b31531dbdf090bc816a783c06b983b5b WHIRLPOOL ed03fbe804127b33b853df19a7462b40931826cb906e60f645737bc7df17870132e8a68bfbe55e6c7a79fc971e2c93e63e6e897da6ff29da0aa1c0998c848f51
 DIST pypy-bin-2.2.1-r1-x86+bzip2+ncurses+sse2.tar.xz 5179532 SHA256 2cc4e6208303ed64a09e9769a866523217dadfb81322ea0dc931e6d4f2cd757c SHA512 3bd1b3a45c60461294eee63d25f4f71c93289d5aa18193585a478dae343fd2930cf3f2ce0ef001fa33b3a6c77abc26842e4941f0573ed163c8a60feb0fe6ff51 WHIRLPOOL 536a6dfbc6f11fb8e3d3f3fab232263e4731ec97cc3eca4c952042c747b30f761821bc4ddf7c7e896d9692d555a5b5fcb6057f3c3c31e8f8cd6bc9edbbd88503
 DIST pypy-bin-2.2.1-r1-x86+bzip2+ncurses.tar.xz 5179732 SHA256 2889b1b3e0af8d7a763f9d237295ab181c9661c0f57d26e799c71d28df388714 SHA512 ce34e0cb0d362381ce6ba8fab84a55463d2c4cc0834df550e0823b6ec97d762386d382ba1a7a5e039ef531070bfa27ed76c88326a48f948cb9f82af78fda2391 WHIRLPOOL e6cc06898e967010d30d225a4ca59b70080da3763e0ad153211719bc99fd707ac8ee8d28ee2c286f87404439424ab59ecf7332162658f0b4cb0a3efbac35f54c
+DIST pypy-bin-2.3.1-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10724632 SHA256 e897fce8057d6ffd8a8f66ddd3736d82c4edae9e30bf0622b5695c083a5f249d SHA512 b3b9ccb63bf2922c734874d745a40c49d5af1e9d9a3a1188c31040fef20faf4fdc00ac1be90ed35848e09bf86dfe5552a720b7c5c4d845777fc85479b515dac6 WHIRLPOOL 583864f5923dc0e0ee59e2397d1ed0f7ecd027605470bb2462f70b40338167f932a235fc40bf0b7349d9facdb7b1a07d86ff46ccc296acc3bb0f21cf7f8709e9
+DIST pypy-bin-2.3.1-r1-amd64+bzip2+jit+ncurses.tar.xz 12234132 SHA256 2169569b4f85869607d4ba7fa57852f954815a9bbb344da4fa842fbc59e4081a SHA512 7484fa22d79dfb1970c926fa27579184f3a38548d8072c49f239f31a8dc5549786776c27c0aa28583736f144e16ea0edb6fb8be81c0e394af783c6916e775cc1 WHIRLPOOL 3b1124526531cbf86e503933e8294ad7d11cb0993c1d103c59ced46830323e7e7c540194a13880d46b730e7b6498b1b48a1a902766948d28379ccf1020f05f35
+DIST pypy-bin-2.3.1-r1-amd64+bzip2+ncurses.tar.xz 6893836 SHA256 e547e1c5674e53e955373f44ab2ef7ef81f0f3f27240070e634c72b666428456 SHA512 5cb35f6a88aea9e92a8bbbdd873235e8b0b5bcce52d749dd80f68ddb7127eae27122ece74e13c4a2360a0dd65449fa7207a5279f0195732946f7ce8f8aa54142 WHIRLPOOL 4eaa864a456fc29a3731801901f93b62b559eb1bd5867f790840f8f8de1c98fa63bc17bd3dec0f9de82d8f639c2ecf8d3831555503c0089a727ff820c525b24a
+DIST pypy-bin-2.3.1-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 9114380 SHA256 9e30512444e889236d2bf762a2378da4a79e9b7c055e525a786380fa6fe391c4 SHA512 1175552bd4abde9bc71ef212c3f817f12e5c1815afe02b43d2834e2ae1cdc358d90701f8db667feabdd13009a955a12fabbe88fa441c12cc02fba4757c84056d WHIRLPOOL db927c10627fade821891fda8333ebcb3b0ead64df6bb38ec7482a5aaa8eff3a2b3b4ee0734c541431dcc7492f24424f42a54d48dc3bbd2d26d669ada776d626
+DIST pypy-bin-2.3.1-r1-x86+bzip2+jit+ncurses+sse2.tar.xz 10074824 SHA256 1a15019bf2c1bff57833c0061e2074e48222142919d32b5e8349f5fc2d2a7dc9 SHA512 a99e880e08ecb0cb802ad78f4c6b20017710875503a1fb73bc3e8c5a7710bbbe1d2d3f57f129b4e815fb9576a5dd92731eccd485915f9f036a227aeaecc8a270 WHIRLPOOL 193e0b219e7398a4937d092684447d633dfc66dfbff5c174280bed6b0e31d4230c6c9847de6fed0ddebfa96e9e76aa5edffb0899542c0cabfc688ad24b9c24ce
+DIST pypy-bin-2.3.1-r1-x86+bzip2+ncurses+sse2.tar.xz 5996472 SHA256 cefe34845216e5d7f5a51e318c5449aad867987044849e61fda0ce5486e68c5f SHA512 df07645f87d29b75da9f9d2213922562b4059ebad23da43d8d0eecc3e5fb95feef990e76e54c2dd86712a253db41d64a70d464f9ff7d8e1fa72aae648c888b92 WHIRLPOOL d806f691fc0200b9d470e6508c4217203892ccc7f2f34045952ce111b2a8ec2027d14e6030cee22c3681817b8f6d66ada49fdb62b32a583751494fd605b08dc5
+DIST pypy-bin-2.3.1-r1-x86+bzip2+ncurses.tar.xz 6025904 SHA256 e8aa0fa467daca78cb0231339d3267ecc396faf7b7b992b160bb65f76b65ba19 SHA512 291d11f2cf9115601dcec95876975d694cffe6b8d156ef91463d17d0de26b13d9ad0d773fdf4f126a9a24fc5fe41dc254df36a51e0f1dd8c1c5fa81155d128f2 WHIRLPOOL 98a8e68fdfea8be8efdd2445aa449f3d32731eb6ab2727454e4c0474025316ce43dfbd0bb2fab3cff698401994c76444133e95df3590894cc733f97f3f541539
 EBUILD pypy-bin-2.0.2-r1.ebuild 4217 SHA256 d312cb044b3be67ce903dff972a09a54105895d5f6bf03c65837cc9918116537 SHA512 a766357aaf8c99d5d12979f072baf3d1cc0cb68fe3146c609b73beaf69ff9b955fd105368c51bd27bd3566d738c7f9e9cd0de4210d8b5f4e64e6bfc7c6cef928 WHIRLPOOL b2f9a1d8145cf9c41be2040959acd76374b6c41b47a96002e12e69eb7ec2811400f37b17e30df4e46ef0a2eca54e9c5bc8b91cfbed6010c6b447288ea463765e
 EBUILD pypy-bin-2.2.1-r1.ebuild 4862 SHA256 94bf541b95559b0245b0ece541325a185427d8e9fbc720fbf5838d72ad86206d SHA512 3c65a1e5f437da9ccc1276b151acfa6b866f4ed3a289473395fb2fe1ec79fbaf127aeb57200009d29dbe7bd769a17f9811a0b0329af10776b8bd347c9e15e911 WHIRLPOOL ee6f704731df42db5093f3d2fb549db56668bd9eea52709a98fdf2da1bd1a4e63f12164eef085e09af1de137c7b178a089147b26caf496bd82fc079505485ed8
-MISC ChangeLog 4360 SHA256 217ad010b117a772660d40bd10d351b57298614f77796d8ac23e272d54b2c623 SHA512 919faf674b6eacdf6d00e78e9c7d84816bb8fc98b99dcad8e8c7b72f1927ed2e6dba4932f8c13457fddc6f72f6a8bf385d4485c33255cf3430e1d91389a4b234 WHIRLPOOL b6997553f6b4034b9a77b1efd899df0864dab608df69ff522fa8ea27140ba83bcf7d76c128ec2502f411b880ad75a0ec7487e2ec4d8458796f6283d3abdb1497
+EBUILD pypy-bin-2.3.1.ebuild 5087 SHA256 cf5781a90a393371b766b7b0e23a00b1e137980730a7ae7f200a10edadf21b83 SHA512 224003d7a42820af4fb7d56a1ca8534c7a724e3b923f601e00715348fe114684a14d9f22a58fda40bad1fb2c8f4a7e5744b19a0e41c0f10d2a6891a460f8ffdf WHIRLPOOL 5f41d87bd3c6603bd579816776b30676398d1be2383eda36fe4bf241aa9d022d037f0ddb04f537dfdb023f59b7923f45f36bfb9756a8d6b64b2665b0ec2852fb
+MISC ChangeLog 4556 SHA256 a1c54d7ab2614eb8bdf0d75e200c4ad14823410f5e439d2a1b316150ab30385c SHA512 014861fabf969f349159f7fd2087d42515bc409226e10a1fd5fd126eb9393999c0f576825e470d8c792c291de52b264fe810bcad19db93430bd0cbe4ef57d456 WHIRLPOOL 26e116e5a3279619dbe3bbd56c7eac627cfb1a207e9e279f387645dae4843961c13b518966c2ea0ed8399570ec4ba236ea0b432a66df1ec243d8078f98b03b2c
 MISC metadata.xml 428 SHA256 99cbecab117f387c279567957835aa68a397906b2309e9c9b8feb80d10812899 SHA512 fda6cede1be6fe8c7d1cbaceebe3193cd16102ad2a570afb1a2269c02ee3021ed9130fc8b09e9f6c5cf742afa95af6864577030b3eaeb41ea29a500826bf7260 WHIRLPOOL 2d765c32b3534dd8fedeee10ea0e3cfcf22fd51121046009a5196ce206dbaf1625f363e8b6dcf3798c6a185de90f27fe06e73b755ad27723ecd8c8bf3ff13ca8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTuUzFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTwagyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvegQAKI3HYUWjENk8MCdaXd54lHD
-6M9uZBQBBYaBMKiIK6DOB7mKGtSl59ZA/b525tn9AMXe6sCCtL8xoLz4qYToOY2g
-Q7JncbyiDIJsisxgrsq/ADDvnD7oDYunjdC50ef2W1gkHErYRYp1B37+jHS1NH+Z
-BrIiCOHklvcAtnBwKtKu/8RdtFTathahuQ2rDny2Up6Kcow2o+VjsO/UR8zZ1KnC
-JqDFc2WzaipMsE7MAJuqNVGg0kLg4jtsEZ24M2g4T9SbUj/o2DYJD26tew+rL1eO
-gG+Hw3+TdykRsykGxZa6z9B+wgkj2AgcrMRPpp1zjS10iMCOVnQmnTQerGtC1R0+
-M+fXJCJ25iS5VJeJixmzYWFDDGWG2glF8jYwP+YltZWzwfe/eLeAfx4H5XHNJNAi
-kL6ZBDUnERPPJuJ0BEXKbZK2UYWWZvpQeD+vipn9MAwcXwCaDhLgJpSZlgHGMnMg
-v8nQ8TO+gI1G1KussAj79Ubmg4Qfc2xDsCUduOrPOr0AT6egb0uwrwuz22vRnch2
-AX7lWfHXu9DXhkR4/ecPiN5eMSVd6cW7JKorkJK/TillFV3hOMdz5DV5y17ZL658
-NSeK2gsSqXPxKYIiQkR4LqQ/lk85Q2z29BOoKv4227T3CID937hdfkREvEQzLNew
-DzMtpoOxjW/t/24iurpE
-=4Gql
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOapIP/jorRqC69x/n3haoPgHHwmP/
+NrblZxHwtgcMTNlqnPYeWX/zod3a8rhuzPrhOUmNEZrbENS5An7yjBFQkVz2ZuKH
+3S+AYz7zEIE1HXVODuzPNW/BP39sUk2FvvaNh2YsmH0IQHtpSG45UxkLuORyM4u8
+Is+LRMbgqCBj8OjO3kxd9P3AO2zgg2RmYlM5+zduruOtXD0wdrHgUfuwoV4eSWFG
+H0Ruu7xTq+YD7lxtgUn6pFrcEyjwMJdYLYP1WyyawHlSxugwDP/v/RSKnHoFh3Qd
+s3sw0O09RlPPtWtnGS7OGXhc/q0q3qbc6oDaft6cBu/xBv3B/5Qfug7QP59zQ/LG
+s8OuxS8ja+pMd8Ux+nkt+GkaVe5NRFn5NgEcZgV+hLCgbGE6IRAZC1ASrfCQSHu4
+xT1QC7d9Wui3UeSomquc8vb3p6gESt2Em+9XExv6ewT82Z7Ud2laImdclTzESJXI
+GI0VgEM/Bp1QJFWn1RT/E4fQAxY2wznVmhPfhudlYeU+3W3JRz7603zOPViZcqD0
+rNgDq4+TTKRj+NmJ9VL0XiR+sd4HhY0XanwQfSRksHBef04CFQPPlVSpM0O0HqrZ
+wcMz9iPVPMQbLRZ5vHJyruvZyxj+t8YulsEHI+rYV2no0SO3IY1euPnw3sfKWaNZ
++NI10MjwgODvDZ8iN+FL
+=Al9n
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy-bin/files/2.3-21_all_distutils_c++.patch b/dev-python/pypy-bin/files/2.3-21_all_distutils_c++.patch
new file mode 100644
index 000000000000..2787360c15be
--- /dev/null
+++ b/dev-python/pypy-bin/files/2.3-21_all_distutils_c++.patch
@@ -0,0 +1,321 @@
+http://bugs.python.org/issue1222585
+
+--- Lib/distutils/cygwinccompiler.py
++++ Lib/distutils/cygwinccompiler.py
+@@ -117,8 +117,10 @@
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -132,9 +134,13 @@
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -160,8 +166,12 @@
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+@@ -327,9 +337,14 @@
+         self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin,
+                              compiler_so='gcc%s -mdll -O -Wall' % no_cygwin,
+                              compiler_cxx='g++%s -O -Wall' % no_cygwin,
++                             compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin,
+                              linker_exe='gcc%s' % no_cygwin,
+                              linker_so='%s%s %s %s'
+                                     % (self.linker_dll, no_cygwin,
++                                       shared_option, entry_point),
++                             linker_exe_cxx='g++%s' % no_cygwin,
++                             linker_so_cxx='%s%s %s %s'
++                                    % (self.linker_dll_cxx, no_cygwin,
+                                        shared_option, entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+--- Lib/distutils/emxccompiler.py
++++ Lib/distutils/emxccompiler.py
+@@ -65,8 +65,12 @@
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -83,8 +87,12 @@
+                 raise CompileError, msg
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError, msg:
+                 raise CompileError, msg
+ 
+--- Lib/distutils/sysconfig_cpython.py
++++ Lib/distutils/sysconfig_cpython.py
+@@ -170,10 +170,12 @@
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SO', 'AR',
+-                            'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SO', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -188,19 +190,27 @@
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -209,13 +219,17 @@
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = so_ext
+--- Lib/distutils/unixccompiler.py
++++ Lib/distutils/unixccompiler.py
+@@ -55,14 +55,17 @@
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["cc"],
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -112,12 +115,19 @@
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError, msg:
+             raise CompileError, msg
+ 
+@@ -174,23 +184,16 @@
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i = i + 1
+-
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+--- Lib/_osx_support.py
++++ Lib/_osx_support.py
+@@ -14,13 +14,13 @@
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+--- a/distutils/sysconfig_pypy.py
++++ b/distutils/sysconfig_pypy.py
+@@ -123,7 +123,55 @@
+     optional C speedup components.
+     """
+     if compiler.compiler_type == "unix":
+-        compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit'])
++        cc = ' '.join(compiler.compiler)
++        cxx = ' '.join(compiler.compiler_cxx)
++        ldshared = ' '.join(compiler.linker_so)
++        ldcxxshared = ' '.join(compiler.linker_so_cxx)
++
++        cflags = ''
++        cxxflags = ''
++        ccshared = '-fPIC'
++
++        if 'CC' in os.environ:
++            cc = os.environ['CC']
++        if 'CXX' in os.environ:
++            cxx = os.environ['CXX']
++        if 'LDSHARED' in os.environ:
++            ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
++        if 'CPP' in os.environ:
++            cpp = os.environ['CPP']
++        else:
++            cpp = cc + " -E"           # not always
++        if 'LDFLAGS' in os.environ:
++            ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
++        if 'CFLAGS' in os.environ:
++            cflags = os.environ['CFLAGS']
++            ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
++        if 'CPPFLAGS' in os.environ:
++            cpp = cpp + ' ' + os.environ['CPPFLAGS']
++            cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
++            ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
++
++        cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
++        compiler.set_executables(
++            preprocessor=cpp,
++            compiler=cc_cmd,
++            compiler_so=cc_cmd + ' ' + ccshared,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
++            linker_so=ldshared,
++            linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx)
+         compiler.shared_lib_extension = get_config_var('SO')
+         if "CPPFLAGS" in os.environ:
+             cppflags = shlex.split(os.environ["CPPFLAGS"])
diff --git a/dev-python/pypy-bin/pypy-bin-2.3.1.ebuild b/dev-python/pypy-bin/pypy-bin-2.3.1.ebuild
new file mode 100644
index 000000000000..673e6fc6659c
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-2.3.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.3.1.ebuild,v 1.1 2014/07/12 21:27:07 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
+inherit eutils multilib pax-utils python-any-r1 vcs-snapshot versionator
+
+BINHOST="http://pypy.aliceinwire.net/pypy-bin/"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
+	amd64? (
+		jit? ( shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
+				-> ${P}-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
+		) )
+		jit? ( !shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
+				-> ${P}-r1-amd64+bzip2+jit+ncurses.tar.xz
+		) )
+		!jit? ( !shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
+				-> ${P}-r1-amd64+bzip2+ncurses.tar.xz
+		) )
+	)
+	x86? (
+		sse2? (
+			jit? ( shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
+					-> ${P}-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
+			) )
+			jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
+					-> ${P}-r1-x86+bzip2+jit+ncurses+sse2.tar.xz
+			) )
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
+					-> ${P}-r1-x86+bzip2+ncurses+sse2.tar.xz
+			) )
+		)
+		!sse2? (
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
+					-> ${P}-r1-x86+bzip2+ncurses.tar.xz
+			) )
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="!jit? ( !shadowstack )
+	x86? ( !sse2? ( !jit !shadowstack ) )"
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +jit shadowstack sqlite sse2 test tk"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	app-arch/bzip2:0
+	dev-libs/expat:0
+	dev-libs/libffi:0
+	dev-libs/openssl:0
+	sys-libs/glibc:2.2
+	sys-libs/ncurses:5
+	sys-libs/zlib:0
+	sqlite? ( dev-db/sqlite:3 )
+	tk? (
+		dev-lang/tk:0
+		dev-tcltk/tix
+	)
+	!dev-python/pypy:0"
+DEPEND="app-arch/xz-utils
+	doc? ( ${PYTHON_DEPS}
+		dev-python/sphinx )
+	test? ( ${RDEPEND} )"
+PDEPEND="app-admin/python-updater"
+
+S=${WORKDIR}/pypy-${PV}-src
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/1.9-scripts-location.patch"
+	epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	pushd lib-python/2.7 > /dev/null || die
+	epatch "${FILESDIR}/2.3-21_all_distutils_c++.patch"
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	mv pypy/module/cpyext/include/*.h include/ || die
+
+	use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m pypy-c
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	insinto "/usr/$(get_libdir)/pypy"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so
+	dodoc README.rst
+
+	if ! use sqlite; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
+	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi cache
+	"${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
+	"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
+	if use sqlite; then
+		"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
+	fi
+	if use tk; then
+		"${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)"
+	fi
+
+	# Cleanup temporary objects
+	find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${INSDESTTREE}"
+}