Update and clean up the ebuild. Provide sane binary packages based on the revised version of dev-python/pypy.

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

3 files changed, 61 insertions, 66 deletions

diff --git a/dev-python/pypy-bin/ChangeLog b/dev-python/pypy-bin/ChangeLog
index c9c265f63067..6e4b7a801fa4 100644
--- a/dev-python/pypy-bin/ChangeLog
+++ b/dev-python/pypy-bin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.26 2014/11/05 21:18:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.27 2014/11/08 23:04:06 mgorny Exp $
+
+  08 Nov 2014; Michał Górny <mgorny@gentoo.org> pypy-bin-2.4.0.ebuild:
+  Update and clean up the ebuild. Provide sane binary packages based on the
+  revised version of dev-python/pypy.
 
   05 Nov 2014; Michał Górny <mgorny@gentoo.org> pypy-bin-2.3.1-r2.ebuild,
   pypy-bin-2.4.0.ebuild:
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 306b19e17686..6f4b349683df 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -9,7 +9,7 @@ AUX 2.3-21_all_distutils_c++.patch 14825 SHA256 99fc72d254a903a5445c991ac5e1f7ab
 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-2.4.0-src.tar.bz2 15390145 SHA256 7e0dec2c40106f20f002121bdabb71939915254fb91bd55b01434e4b994113d2 SHA512 b6e0c48a16e842374c400dcf6cbb01eebb33fee35804540d3aec52d2612c4093a9c57f3b2569176784b9b6ba8af428c0c238ff6db45a1773d8edbc44cc615598 WHIRLPOOL 8d80c89d3026215ebea3893f3c37dc431ae9ed3c381f3faae12c7cd25a2bb7beba583f8aab0d813429339c0f3de1f345550b5b9228b480c58ab7daa2a7b39ce1
+DIST pypy-2.4.0-src.tar.bz2 15495214 SHA256 38810007aee4885ca0703b566db6594dd7649adaaa287df7a1012f10e067740f SHA512 91b41ed80a6ff0d7b2b134a7802f098de35ffd2068dc3e477d27b0bc821c6d329eb8bcad4db4a5ff9ff429830d4abfbeb435a2a2d2d9bbc2c36f2d21af0b2e0c WHIRLPOOL affb14b805b2dcb8b579dd421bfb8276e80d3b31cea41bf57ad5dd9260e2e27d838b0303e4a3af5ca38b0b4f08ac88b142d6f1db20753bec6f8cbfdfc482099b
 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
@@ -31,31 +31,35 @@ DIST pypy-bin-2.3.1-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 9114380 SHA
 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
-DIST pypy-bin-2.4.0-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10283108 SHA256 e202908d2e3c24f9b08c29d32168af487cadf01b7e728bba7d8f299dd4b60df6 SHA512 b93a069368b390a070c06309ed0b8ba1d9bd922f7935850bc7638f554fdff3a0e0c5cef1a7c45fb115e441cff72e5f80bcf2444c915526ac529dce4d622e2291 WHIRLPOOL 7f82630cf144036ea21415155f13200b2c06a0c571d048e9ee912017524806239668b62e03c6927b88bd0c6adf1029b5344292bd6c572714cf7853192d6a0055
-DIST pypy-bin-2.4.0-r1-amd64+bzip2+jit+ncurses.tar.xz 11639092 SHA256 77d4377adb3a8ae682aa8b3d2dcaab03610a8822a4b5189433e95358f9deb431 SHA512 315a243d4979ecd6699a2d39b7aec4497b92bd704b2b86d15433e126005aba073bada9667fd59b98847a139230073ef82da65cc12c720bc5f417b54e1abb84bc WHIRLPOOL ce2245a489617ff2b583452bbf6b4ad724a1aab4582085f500a6c3c9d65f77fb48a16a3ac2953252509ebb2daea4ec10739d3c0ad9d5dd98628bda88b4337cae
-DIST pypy-bin-2.4.0-r1-amd64+bzip2+ncurses.tar.xz 6603856 SHA256 6670aa2e074e1308c7dc7d8d616a3c7bf59af479eb83c1fd9d40dccecd2019d8 SHA512 7510ae4ae9e2bf428adb57beec12f50a910af121f5df8f4f0b5545c309969393b499d63ed4f4a8cf7fd0e9a2ca924bb14bd45fee0bdb122a8edb9ba9e39382bc WHIRLPOOL ad26729e8bbe4cd291f1e826ad221a17f922bd063f521d73db992334a33f94f26ee3aaaebc6e2ed4870f7505d97ad443b45a4d80e5ec6d6708569d23dd0bdbfc
+DIST pypy-bin-2.4.0-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10238896 SHA256 158ebb6bef9e77c0ea84ade4449717a608f3e2378b18a198a15187f49f240262 SHA512 3baa4387336ee343949ff7a04de236ef6da1446efa9ae565a61abd6d5d3915d54b51d91d4958b8c1ec61d894943804ea1158c0618349fc4c9e52a8956a4afa56 WHIRLPOOL a2803b6f42a35b74761af918be7c33a460bac246fdaba3c1ca34b3dcff6bbe1f68a1a4299123ce167664516b7e29bc8450cdb6be196313657f2178259b3783a6
+DIST pypy-bin-2.4.0-amd64+bzip2+jit+ncurses.tar.xz 11771744 SHA256 4a05b8819486693c83af7cf45092926526f5511615b6d4181f72e11ac240f263 SHA512 d8e5c1c1721935fe73254fc3037176ad3c71d96acd55d8bcd15bc7b317a72261b7e08a6ae28cb62bfb2203f06b13839670b5da3e435cd87c0f65fea259be2732 WHIRLPOOL 496f244487146e1acd34981b3ec4af81590b136b884f0cb698fc35698cadfad1e278ad627563fd643294c49e1ea27f05c180dd05b3f6d2d4079527775ef4ec90
+DIST pypy-bin-2.4.0-amd64+bzip2+ncurses.tar.xz 6596304 SHA256 f2f2fa539ec1f3fd048bd81bb5fa54f260980fe9689c578f134f39ecf00aa027 SHA512 e8603ba08a11c1cbd9d3af824aca1c4ae7b61d46879b398d5d18428bc438c2e0bd0fd9ecd83f100715b635968eee3805db18a42ab62fbc10d8cd0186b6998431 WHIRLPOOL 2758fc778a1f9e5db966aa1e5a47a8da8c1fbb5882aa74ba9709c23e1b3a546c826de8ea4ba83e5baae262a51636d7201445102c97d4c749a98805a46aeac9ba
+DIST pypy-bin-2.4.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 8596232 SHA256 3fded027e8e70fc11ec793b99ec18bde7893c54122492e5599fea59049b3a5fb SHA512 bac9647580cbee99e327d436a02c038a621aa6f4b2635b3a392218c76a0690bb9a8f3a3f79520c716cffd30a613874a1104114c287e130e2c0eadb5f3a5b05bd WHIRLPOOL 00f646d55093ea07abfe1f8ac9e354f8bb39a2dd3fe2925436583ad6209e6da0c34476b29832de4274dfe516d70db5ea6345e23532925ed09360464d4405b926
+DIST pypy-bin-2.4.0-x86+bzip2+jit+ncurses+sse2.tar.xz 9511800 SHA256 5178ce53d9da16a0d989797dd909677aaec4a8d4a936a4d27d8be1ea248489d9 SHA512 4910c72ea0b0849245657772eebfc598779f4a3eb077cec7d6e735c8aae3564ab064f9462fb0576f18792df2459d6c8f372578803497a83e4525671ffe0f8054 WHIRLPOOL 1ae421817e5f5f30ae7e9c446b4afe024de7d271a4fd8185002240e942c96dae93d45e80f6fe794dcb4a1c542a5b2ba76ab1ee81702e501de53861901ba7092b
+DIST pypy-bin-2.4.0-x86+bzip2+ncurses+sse2.tar.xz 5655980 SHA256 fcfbd71b903e9c6a26cd6590090d8d0c2f8c507e9f4650f7972f36a8ef86fcc6 SHA512 45d71f2d785a65091c9f25376bcb2f7f7e02cf1f00111fcb4b0a3bf0fc5e56947be7f66f5281744de31424f9e0b7249523a4bcd5fec7bf4f3c829b66598b02af WHIRLPOOL a9fef84296f9e77062b0e0cb17537615a02f3ba7d0ed804cf63cce9baf7c1ab843b326301bde5e5a33744b716ea0efd4619e9ba55c0387acfa1622aa11b875de
+DIST pypy-bin-2.4.0-x86+bzip2+ncurses.tar.xz 5634780 SHA256 2d0494fdab270c26efbe84fa42118b822b3fc021940e2d260a5c39938dcbed8d SHA512 672468e436646ed0334352addeda824ddd76a4cf1ad46231983aec7b697ae6ef2cc2b9072ae5149b4b0987b06caade65ab8bf67ca1dea10219030a9b3fd5b4b4 WHIRLPOOL 003bf4ef085b01c6625f43d34bdcfc2fa035e93373197c67540548856b160db39aed8f0a319ff3f77063dbb8abd2b6a4b412dccbab8c6a70689cf701cf98c4cc
 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
 EBUILD pypy-bin-2.3.1-r2.ebuild 5590 SHA256 9e7304be8c769be51a69c7e95025b262ccf3baea9bb106aca1e720a2dcc453b9 SHA512 2e50f087513f1b1ee5a15c701c20ad59bf267ce4ecfa506addcc88d5e15556367baba689427ad6ed5d412871216209f9ff6d6fc63c53e68c1b7918c0bacd3498 WHIRLPOOL a6eb1d6bb73d305da286524502de6ad6c42ce52fb1e145253499a6ba11dd7b5ed1a3ef99c38b28ef6ab2f0dae11d78d7a083e536b470fee9d3a02ab1c88cde27
-EBUILD pypy-bin-2.4.0.ebuild 5784 SHA256 36f948d4c36c5ff7656d4f472361cc66e2c0552aa11c0916386cb6a49683a6e5 SHA512 a15d0e95d462299a71c2d0ac9a7b1b0b864d32fb90df3690919c83689f43026d26c33c7c4bb7d0ef0488fd20130bb37f653729695f900232e2227d54eabf5871 WHIRLPOOL 3aa31e63d8acb8a0e164d3678f9cc82d8c4b64442befb333173bbeb99b011e165df2e50e9e11465e4e2f1beba85e72b57cad9521f6b965bd2c6682d11006018b
-MISC ChangeLog 5663 SHA256 a4f3db3ba557f940a71b169d8fdd6ba0081385aba80e7771bd8e540f5a95c723 SHA512 57ac321f5f94841f33842fc10c146afd8bfb84ae66eda8d757f21f99fd32afc0b526325e9290ca6036f6db6c3212a6ad69b9f8040944f2995e503620b9c8c8cd WHIRLPOOL 92d3af2acb33238e309582456d7d0e22ee8270b8a29632b3a17f31069c6405f2d43350cf15cbe2165bb43c59b8e1a851c0eb86140ed6c7d56727952148c04ac9
+EBUILD pypy-bin-2.4.0.ebuild 5194 SHA256 444f66f3bccfc3c922a4fc16bfb85b4292d73d8d31dfd41c9bc0e9d5644526d1 SHA512 cca13e6caa6e6064b6e63ca0332a96b4f8404eeba61cf68bd3a84eb67db3aea686802c6fb3ef72bc8d0bb43b0f41893a022003498b62ac8cb9d5b504d2e48ea4 WHIRLPOOL fe58022011b6006522d8fb393d5954d9ea03d6b3efec8e8e5924a1088a20cceead5f8f2f25200972a9d6a7f105b39454654ecfe962542529505b6b21ebf920ea
+MISC ChangeLog 5851 SHA256 7433b13a00366b8e5e083f1c39d0e2616ea02df7153b7b1ebfd74ebcdbc4bcdf SHA512 fd229dacd405f107906fe1816a1f3b5e53b3cce7b752a086d4a7b2b9c6245af058fc3506548e042e85046d494c944cc25799bc655b1a66050e6ba1eee3354856 WHIRLPOOL fad918aabc346467c24c1b0bdd2f563792e3b18bfc602301a57d740147c7cd50651e978300e719c714e92669bcdae5f52585758fb63e9d7f3a0b671f9549e5fb
 MISC metadata.xml 428 SHA256 99cbecab117f387c279567957835aa68a397906b2309e9c9b8feb80d10812899 SHA512 fda6cede1be6fe8c7d1cbaceebe3193cd16102ad2a570afb1a2269c02ee3021ed9130fc8b09e9f6c5cf742afa95af6864577030b3eaeb41ea29a500826bf7260 WHIRLPOOL 2d765c32b3534dd8fedeee10ea0e3cfcf22fd51121046009a5196ce206dbaf1625f363e8b6dcf3798c6a185de90f27fe06e73b755ad27723ecd8c8bf3ff13ca8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUWpQXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUXqFnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOM5gP/i052/AVlE9kTHT/dOreokuY
-Zzer/RObZm+3Xqla85trLqUgH4VyNlymOmJFh/uUfMwbwZgJXVZSG9uqOG6N77du
-7nSrs16W4Cio50BCwYQsldd6fGhgf1AqzvJVH2+1morqWJUsDhBTt47zkjMwezkH
-PibNwILe/9GvtzwyMZ9HyWXFoV0Iadn9Xmg08Wsk2UZgvNHFve3UBN6tuN7ausP/
-ZLEsESwW4mWI+SltygZ+EqygFz8FEOPPJRPD4gyCwJXD3Gy6QWkPCMX4ln4oo0LJ
-ZAvo67DJ92CZJhrFSE4aroBvO0iaO0Fzem7DFNVZzZASLVaq+CC+puNPRwW67BRZ
-IDIK9U8ImscumLU0X5CA7wY7ULQ3TCn0/VV64GEZu5JV7B5NJpukWS3lbVu2e+1Q
-+SUg1GtxsS8lnBDDLDjV1UWG9QK8h//AhbF9dqkFyEaP9FvfE9W2HCEFyjbfvV8m
-IUbUpqBOO6WARvn9oZtstslhxmKZuC+QEQy4o1g2pEJ6QynJgwvQ3hgk0cIZlnWa
-7QNZXo8mTtP9jntHTqaQBfLj5Cb8njsfV+aih7GDbAocXZp/YTbJ1gtCU9V4tv/o
-2QzkDWcE8sMemRK4WFliFNEiRpDzYQRn93yHNdKDeuzr4Pi2KCloiQgx0XlS/dEg
-Pz3oTLYby+JnCfPXTkSo
-=WpLH
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOzZ4P+wRp/wswsPxdu3+TlYLmLU8p
+IXLDyh4/xL1SphiUalGsaU24ev96H0+AbjL2RK/lhHuUn9D7pF+za4x0RBkt8x6m
+0AjkH09B0YVXvATvfSOdJ1RSRA98Jk4O7MHEhnsAamjbRPlmtLnAMEjg5wDXibK/
+h714XSiN3Lx/kZ/T+ZydAX2ufJ1yCjx/h1huTlRG4B4pDtA3C2YGOPgd88K20xMa
+lxTAJs5A6wa9l72zUtY0Er8eTGnJh5dLyUUlhfR6qnaVVwUCGpm7uZC5+roZIOGl
+3XkeCbfbLYg4koGlphaNnSLa4b6bw6dvf5K2+qpb7/rHID72U/D2iOlVmTX1kPsX
+NeqOuE0CS9LXzpDvkR+VXESFb07h9+5ft0XR7Xt3S49I14QyP/xPwX19TnjYN/HS
+LxmmEI2hy0trFPkyLF5FvZHOwNgOVhMd3G7QrUzZtJbUZx3uo7gXww8N4QHU7bWy
+8r3t5vlHM9JWrBdYx7+QPuGM9jw5xuBhSBpirRGkzjQ5+0r67AL4i3QGiSF/5ezJ
+dQmMdT2lL/ftLjl9Rmh+5/yuonlpjMEyaenNssjOPa+x8fH30x3MherTOzMG00By
+7sMOaoCSgH3o7yErCCBuY/mDNGAHMCqL4SwKzBLBtslpGmFyen99suN6AvqR5mJP
+Ts4pZDwY7O3lqAYp266X
+=5lYH
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
index 6c7e19734204..3e6a96a60a5e 100644
--- a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
@@ -1,66 +1,54 @@
 # 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.4.0.ebuild,v 1.5 2014/11/05 21:18:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild,v 1.6 2014/11/08 23:04:06 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
-inherit eutils multilib pax-utils python-any-r1 vcs-snapshot versionator
+PYTHON_COMPAT=( python2_7 pypy )
+inherit eutils multilib pax-utils python-any-r1 versionator
 
-BINHOST="http://packages.gentooexperimental.org/pypy/"
-
-# x86 currently fails, so no pypy-bin yet
+BINHOST="http://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
 
 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
+SRC_URI="https://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
+			) )
+			jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
+			) )
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
+			) )
+		)
+		!sse2? (
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+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"
-# Needs some more sanity checks before it gets unleashed on users
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="doc gdbm +jit shadowstack sqlite sse2 test tk"
 
 # yep, world would be easier if people started filling subslots...
@@ -92,8 +80,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/1.9-scripts-location.patch"
-	epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	epatch "${FILESDIR}/1.9-scripts-location.patch" \
+		"${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"
@@ -115,12 +103,12 @@ src_compile() {
 }
 
 # Doesn't work - pypy missing its own libs
-#src_test() {
-#	# (unset)
-#	local -x PYTHONDONTWRITEBYTECODE
-#
-#	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-#}
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
 
 src_install() {
 	einfo "Installing PyPy ..."
@@ -129,7 +117,6 @@ src_install() {
 	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 gdbm; then