Drop old.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

12 files changed, 28 insertions, 1621 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 1d9e54874ac6..7f87b828da9c 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/pypy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.44 2013/06/18 10:41:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.45 2013/07/21 20:46:01 mgorny Exp $
+
+  21 Jul 2013; Michał Górny <mgorny@gentoo.org>
+  -files/2.0-distutils-fix_handling_of_executables_and_flags.patch,
+  -files/2.0-encoder-3655afd07f2f.patch, -files/2.0-no-static-hack-r1.patch,
+  -files/2.0-no-static-hack.patch,
+  -files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch, -files/
+  pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patc
+  h, -pypy-1.9-r1.ebuild, -pypy-1.9.ebuild, -pypy-2.0_beta1.ebuild,
+  -pypy-2.0_beta2.ebuild:
+  Drop old.
 
   18 Jun 2013; Ian Delaney <idella4@gentoo.org> pypy-2.0.2.ebuild,
   pypy-2.0_beta2.ebuild:
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index dbcb79242a7a..e8aab57a2dd1 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -15,29 +15,29 @@ AUX 1.9-signal-a33052b17f4e.patch 2386 SHA256 3bbe684749f623005b9c5f6234d28924cc
 AUX 1.9-ssl-errors-25d3418150d2.patch 1480 SHA256 b108e679545b81ca87c391a92b9cc6a5cbf24997d6b6d543574c3fdf8916772a SHA512 db47856b499d6416f5502bcaa13b9e7120ac9e9181ff1df74a07977a6187e7f0521a78da32ffcdf4acd21ca7b120f674a69caa487de5775db0c6a03fd40cdd93 WHIRLPOOL 8e310889ffe6efb126a8f83c7310ff53da2199334d534933b7f16fd73cf7c28219c5d9a997d03274554423739d6a874c1deda7eb57ea2c49388a25f49efbf00b
 AUX 1.9-ssl-threads-1-34b3b5aac082.patch 5068 SHA256 02a8d9d5bd0e9c09ae545cf58c85e59d035d208d739adb84d778e8997d75a1d5 SHA512 1a55b72d62fc74e7d2fa4aa11294862782978d1a7f5ca6fb3f58deafb2d9aa4b54bd49a59334abb111543c798fcb817844ec19f70f88235b3046bea707bca077 WHIRLPOOL a5818b6711260a972b2af5d0cafebb47a2d887d207f25cf320ffc9488d2ea94b6ce5bbd6ae801c131ac83c0ee3cba26082e5300b8a50f36f0d0350668d1b718a
 AUX 1.9-ssl-threads-2-25cd11066d95.patch 648 SHA256 daf33460b2e7f17a45cf44331e00df84c2651a8446299700320fc75e53392f6d SHA512 cb489a6fd6b805f251b2139420992cdf7b7aec2425c6f5acd3be7d0dba7d85eae689073cd29b083685bef5696ea6c237673876e3d01f5b6b955ce8c3f3764173 WHIRLPOOL 97c6fc342b8eef9388b6df7b0a2dcceba73c7dc667e06ccb227017fb85feec1cc5e4e236f50e61a72573493daa4fb4b16d8ec2907f0f507a2364690b1afc883e
-AUX 2.0-distutils-fix_handling_of_executables_and_flags.patch 15198 SHA256 9b2f95b835651e9a592acec9ea347cf99a4e9bb84418a73c6d5ce80b98b1fb08 SHA512 06888c2bdb4dc87ef44e6cb3c4684cd0d686469a43e8b9f591888205c61e19a457ef330dedee71b7d3e00612e234ec55ea6ade1daa1ad549e33ac8db8ad1a771 WHIRLPOOL 33ece4661c49e836c33253b5d00e0f01ce873685ffb3fe461a1b4e64471d933c8d4d76b25955a13967b6f68f9f232239c690cd8ad23ba71825af9e4fd49b6c8a
-AUX 2.0-encoder-3655afd07f2f.patch 13820 SHA256 2161f34b6ec716737b0fbf7701ba96e1b40c3ff3d7246d5468e4132a94b692d0 SHA512 64a898bd68d99dda98df614791cfbb2bec102bcfe784de7b312caac956d47ed1210c338f9d8ab618b5b099b9e9f5ac6fa03b47e3c6167e52e72e1b24cf78631c WHIRLPOOL 970eb2db9e7bb699864e2984924a04763b328ee4704c8e6b223c05951ad71ed6a7ffdd7cbb1c8ceb2c00927a30194ba6f75a55ef24f8e8e09fb796255e5b0958
-AUX 2.0-no-static-hack-r1.patch 1552 SHA256 6132297862c04e890d8c6da55b17836004c83a084d2db7b23e970d26fb3a0435 SHA512 a92bee4a5434f9b653b9f180d9ddc451c4b258a5bd99f894dc3084bdcb7c25fc2ad4944818c9cc5887d069061a2643f74521a7482ddaea39bf0fc32e6840e79d WHIRLPOOL ebfc52da8ce8798fd6c72873e9865374fee7920eb961da3a2dd309f9f8f73063b0bce591d2903731ddcf561c28ee653190a1e609a942b7cda615433cc602b056
-AUX 2.0-no-static-hack.patch 1542 SHA256 75a92094d5f6c6bc2411a40f7432108c07c542e4b96de2b873a42fabf0f768eb SHA512 50c1087eae07fcef306de83ccde7edacea552e498f7dab3fa43626d05c38c9eaabf7a45780b8315b8b9d841da6086ee23cde1e51bf4796ac397e9b8d94bc316b WHIRLPOOL 97ca09dcf34602cce274611d607c0a1356f760a6e5d6b62010cec1fd33d677853b6cdab41fd52aedf0c5e506c331f80c37ec4547fae34ae9fc041fb14e9707ce
 AUX 2.0.2-distutils-fix_handling_of_executables_and_flags.patch 15206 SHA256 0e0c1ad3971abf7318c6add811caff2b755ea0e42397cfd92611d47668cf82b4 SHA512 965a10eb8de03d78d4a0b2a0dc23a5f8b9dd54ce42ef0f975cb26ef3de8c07b92f4ca1f415d41156aae3b9d0ce97b27912f7d10b06c24d2f44b371df66613fde WHIRLPOOL b830af87d2881dbf23df89980b3aed0089a4ffa38ebd99b1d93608cf5482377a7d6680a3b446227bae9f9357bbd8c814f4d083f0a057de98faf81522c3dcf15e
-AUX pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch 18064 SHA256 43cbabdf5f7b094eb969c754bb6513fa324b1fadb40b37d78bd1ad47194d787a SHA512 eb6c70b84d204aca9975efd99ae66f8a629f275173a4551e99250e989fbfb1bc6d8696fa46e4a320425084540f845b6dd9068ebf6f7b17d99351c4d324b64049 WHIRLPOOL ba514f2b4f5746b90d380843bc09974fa3cd0657a8af9da12e4a780d03cd1213b022e92b5d6d0256b204084952f372a4af0f7de3a2a5c0baa7252957334c7546
-AUX pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 569 SHA256 55ea809a5f3e264b1905b06aa3af78aae149451e7d74a98d11e87629ab69493e SHA512 d4627a762a5cbc45ea3f03686249b6fc206346d0514ecbb4e41c3c20f480c6fd9e689ec156a94dd8f88f4318fb48dc4a7b556e586e9f175627b6177391f64ca3 WHIRLPOOL 4f1b8e235851a52fc63c2022f98fdaa426d49f65a7e01e51625adc54efb0b17081a342db330ad269b8dbd4597db214c9b2cb32195048302addf1926ffb0e2464
 DIST pypy-1.9.tar.bz2 13466551 SHA256 9fd599acade49ef98017bbce4f179f19cf2680489ff15235d3bad5b20bde0d68 SHA512 1e02f1f1ac493be35272212f2be62db17a01a95c56ffbd8c00a043587e38131e779928fef1383c61575ecb48bf4dc407b62726d30d5b5728221a612fe67ec8c3 WHIRLPOOL 5b601f31f695623c2e5f6d48ae902e07c5cdccafe415ae89878e5cf71408b31fc44fb1c173a93e66d81188503651000de219533e69071495b87d80a8d217274f
 DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
-DIST pypy-2.0_beta1.tar.bz2 13654084 SHA256 492fcdd8f37990e7364eb5f2c4b5c2b0f61b44b2603207b200fc2d4e44b413ce SHA512 50b8a26433fc04bb35c9a0669f7da94621eddb3e303c6eaf624b663e7b2f3656a80b238227204938fc22ef3c15fbabf1d04e09d3ddc0377be008f7f40d4c0721 WHIRLPOOL 07e2e430a1d01401a0bfbddb775652acaf09ab05d8d038a644454c9802a463cdb83287620ac8bb3af6f235d21228d1e462e3a041e5770773cb50786740ae259f
-DIST pypy-2.0_beta2.tar.bz2 14608838 SHA256 f8cdb5b1402dbedd329650cd54925a9c72f2e3140742f289bfa919bf1e190853 SHA512 bcbfa1c0f4f710d3846a1700569cb2aa5e00b5b2cc0a16ae7f2ba6a922e35b22e790984fa9c161939f24b3917fed779c1b29ade5163231cffcbb1763a69053c4 WHIRLPOOL 5615194d0cb8056a2c63d339ad6a53d4ea4c4657e47d3095fbd4b99d003f29d37ad88838c9ea071bf3fb375a1f51b762a77242ff2c91c5abb92d69f47473ea34
-EBUILD pypy-1.9-r1.ebuild 3824 SHA256 28babbcc17d1b081558493c8b0bbf568b98367d301ef8afaf060a584eefa6919 SHA512 2ee0246a13e399c7842e445062883c57525ea24314c1cfb43d10e4bb67607560a015dc2ad2ed7a24994ff528a0ea782efbac142ada5ad0a9171ea490494a82dd WHIRLPOOL 4702569f02d402de5e45159df05a272e9e853442c114889c634f3f996770c1f4fe7e3c3d8e8d56765bb03a0ecfdaabfad045e50670bd6452825db06bfd303e9f
 EBUILD pypy-1.9-r2.ebuild 3897 SHA256 fa1f7192118019b73b6e1c399603cdc98fffc24e29018a9d2bbf2de6364761ca SHA512 920a6691835f8b7822e63b520f5b5d3ba367b55f56d61520552020154c3dd69c79d2b5fae155f3d29a99261f9643b5b12429d8fcf4c6e2f2d928d2f900652323 WHIRLPOOL a6552d90181c09eea456a37d9a253bbcdd29c96956d7113aaa38b5d050f03cc1068fbe2e8e72c6aa7468026ecf30abf6fd642a84d884c451339bb88b60dfab9e
-EBUILD pypy-1.9.ebuild 3075 SHA256 4c49bc7e33ea8eccc5552e30cd2dab691ed579a5686b71ec97bccfa9336cc798 SHA512 3758cb3f6b0f34e45318e31a5765dffe369f0b63dbed1471f46c2c0c1948359026c413c19c77a95da5e16ebf96034186fc02a6bcf15f62dea5a034f6ccf13468 WHIRLPOOL 544d46da00f3e17c607cd284ac0413ccd565428e1d7a0217d1f2fd1bbb927433a9147b57957b293976c9eb26507e0365fedb26b58af0ad6bfdf6c16b27dd691e
 EBUILD pypy-2.0.2.ebuild 3796 SHA256 4b0412c194f73ebbf3bd3eb9249a8904f1e6c76faf88f621f1c88d53338e7f8f SHA512 f7991534fcec628355c64cb1a18af1daada01ac59143f9032fe519e3e1600b838e316b8974eae13447c6e2fd7e8188661b3732044f0fb8d935db8c8ea306bc3e WHIRLPOOL 06c44af64a24bb718d2ba31c1413e16418670867e1c6ea28654ce06d5808dbd9d51e1423dcc1f66b79feb9474785dfe1207a1494d886992eaa8f4452a4aca604
-EBUILD pypy-2.0_beta1.ebuild 3320 SHA256 6c0cf72ab9059a1d90b6c8eeda1d3c30e392f656fa1cf8616b32fce21f9d536b SHA512 54a68029d6fa41632597cfd402ce78cdde0906a3aba9ffbbe789fbf1b0196ac41cf391a3b7938edaf3a4c3c908047f6d642bb94c3812186849221204ea9b5715 WHIRLPOOL d6205a4cf9934415830a3f231ad9b12ff302cf8120092d62726367610fd94879b89d3ab7c40c4d9ba2418a80264ddc8e1c04ea0ee5836d141c5c154bb33a290c
-EBUILD pypy-2.0_beta2.ebuild 3871 SHA256 37a0b7aaeb1d1a113e00a11a851eb7fb4dc798349aa2ba7207164fd827efdd66 SHA512 bb4185c136cc35afb63db59c3f4a5ee75e09d35384731c3724cd7a8da7af62d19c98681f7191795a2b06a846ce1c3bde658ccd82411be108a9db7a36cbacc112 WHIRLPOOL e8988022b6d0e0036f19bd86e230db46b3764e48e197da8ff3a006de92651185f5792176186a9eaa7c19c35a97161fa46d15e65e268baf0fb4a8960a0b69e00f
-MISC ChangeLog 8009 SHA256 708f47220cfb6e70f2948c4145a150a6fc55eb5270816d5b73fd9c6333d85e46 SHA512 af18083ab6f89b7faf2d0213adbbce1a55ab45825ed0cdd36100245c424b1a42b8c005c2cc59e3813ef2e408f095961b8f1a34ea6289cf7b419491d356a40da2 WHIRLPOOL 2bcb1fc179f80e6fcb5602a49cce025633e42d8b92c2e2b24e73cace9a6b53a58b1f2c5a57e20a6aa9bdf580abd01b8d754ef3229390903a595002f9f6875a33
+MISC ChangeLog 8507 SHA256 9b5bd824cf522ebba7973cda5aafd318183b4fa572f8c51c8a71e26f1462173f SHA512 0f51333b12246c15dd20735c608d913c4658751a8726ed0d6dae9670f69fe307b05e33e20fbf3df89562cfb6628c9452db08ab7e3505dd73e3fd444e8c0bc590 WHIRLPOOL 1a8b873952f612e5b1cf8d1d79d35122a754ee0c6af05568e2f5fca69d1b967a1c3cdbd53d5ac2e416234143b97695cdf85e2f1b94631629859cabc810b4cde2
 MISC metadata.xml 388 SHA256 7855e6ef0d921319b41f4f84efb0e68fb5be892d20a300ad2a2eef57a5bb3fd6 SHA512 d69bb950ffc8287d5ee81cd275607e8d77a28900563ecfe7d4f1f3facb5f3619f5a677a4d6244cb9cfd80737c9218058450891ca855b38813c6b59d410045108 WHIRLPOOL b05794c728b9cf9878fd6843275f35552326cba61461d22108f8e666dc4a70c25e08c5a95feffcebe853b3a8f2c3e2894cd4e3ce4003a14f471007fd525cf96f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHAOWYACgkQso7CE7gHKw2ClwCeLkYC/lhfyhTq6YmBnx3eZQiS
-3uoAoMjibhfjZIrL65/tpH/oMPXskTFJ
-=wVOj
+iQJ8BAEBCABmBQJR7EiZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDBCAP+gOy3kjy9umatfZ5WXCFMFmg
+tgvA7L6l3cderZDUrFoJU18ZV/g8HxO2SmwliVTM8xrm9syqeij4463fZnYRtH+M
+TBHqJ7MRoNpWqDnPVBluAa53BYqr8785VXrFg4izYHajAj2H3vg/ykEUaU/tWdnj
+54XeEEOPfBGtdrfYAaeTVzFhEbXCWLGownv/5Ahvk/8H9Xnz9WyCudOEIySZDTzy
+d46qqPUiKY10nV/xu49m7SykTdcFSWforf6ihVFewqAv3rDHP6STtYr3jC9w7wiA
+dPCd7ZHGtgy5ec5H0L9eNPWgeGTuAlMsdyGgXGI86sHtbLDu9lNCgKb6620wkSK2
+u2Wg3b384Aa1YfkdFDcPDtwBrzehMighmkjApTs1n7zTQBPrszxeVQPvNBiNSo2v
+X1xjRObypI2W4mPXFocJPTUD0SCfaK+ZQzldes1qF8uMIfTWg2IkdcRVDLwckVrI
+Jc4nHuSgMHJa2NEZ/eSADoCegp1moWnSHRMTWPKz5mx702lhvZh9fxVdsLvP02VV
+UzPIjNP2T7E4RrvCFy22Xc+kVXkNMAkeYVhEDjImU0nsDs0czef1ADThKhxUyGSg
+5xzRa8GYKG9+88GtTWyaKeQ911NRl+oGNpLbn96IDC3EDMYUkykT++kvsxDMJGm3
+dHEnR+kk21MbVyngeBUT
+=lnZ2
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/files/2.0-distutils-fix_handling_of_executables_and_flags.patch b/dev-python/pypy/files/2.0-distutils-fix_handling_of_executables_and_flags.patch
deleted file mode 100644
index 751650d30bfd..000000000000
--- a/dev-python/pypy/files/2.0-distutils-fix_handling_of_executables_and_flags.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-http://bugs.python.org/issue1222585
-
---- lib-python/2.7/distutils/cygwinccompiler.py
-+++ lib-python/2.7/distutils/cygwinccompiler.py
-@@ -132,9 +132,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, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -160,8 +164,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
- 
-@@ -322,10 +330,15 @@
-         self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
-                              compiler_so='gcc -mno-cygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mno-cygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
-                              linker_exe='gcc -mno-cygwin',
-                              linker_so='%s -mno-cygwin %s %s'
-                                         % (self.linker_dll, shared_option,
--                                           entry_point))
-+                                           entry_point),
-+                             linker_exe_cxx='g++ -mno-cygwin',
-+                             linker_so_cxx='%s -mno-cygwin %s %s'
-+                                            % (self.linker_dll, shared_option,
-+                                               entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-         # (-mthreads: Support thread-safe exception handling on `Mingw32')
---- lib-python/2.7/distutils/emxccompiler.py
-+++ lib-python/2.7/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-python/2.7/distutils/sysconfig_cpython.py
-+++ lib-python/2.7/distutils/sysconfig_cpython.py
-@@ -150,10 +150,12 @@
-     varies across Unices and is stored in Python's Makefile.
-     """
-     if compiler.compiler_type == "unix":
--        (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 = ''
- 
-         newcc = None
-         if 'CC' in os.environ:
-@@ -191,19 +193,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:
-@@ -212,13 +222,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
-@@ -530,7 +544,7 @@
-                 for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                         # a number of derived variables. These need to be
-                         # patched up as well.
--                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-+                        'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-                     flags = _config_vars[key]
-                     flags = re.sub('-arch\s+\w+\s', ' ', flags)
-                     flags = re.sub('-isysroot [^ \t]*', ' ', flags)
-@@ -549,7 +563,7 @@
-                     for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                         # a number of derived variables. These need to be
-                         # patched up as well.
--                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-+                        'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
- 
-                         flags = _config_vars[key]
-                         flags = re.sub('-arch\s+\w+\s', ' ', flags)
-@@ -573,7 +587,7 @@
-                         for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                              # a number of derived variables. These need to be
-                              # patched up as well.
--                            'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-+                            'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
- 
-                             flags = _config_vars[key]
-                             flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
---- lib-python/2.7/distutils/sysconfig_pypy.py
-+++ lib-python/2.7/distutils/sysconfig_pypy.py
-@@ -114,13 +114,56 @@
-     optional C speedup components.
-     """
-     if compiler.compiler_type == "unix":
--        compiler.compiler_so.extend(['-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 "CFLAGS" in os.environ:
--            cflags = os.environ["CFLAGS"]
--            compiler.compiler.append(cflags)
--            compiler.compiler_so.append(cflags)
--            compiler.linker_so.append(cflags)
- 
- 
- from sysconfig_cpython import (
---- lib-python/2.7/distutils/unixccompiler.py
-+++ lib-python/2.7/distutils/unixccompiler.py
-@@ -114,14 +114,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":
-@@ -171,11 +174,18 @@
- 
-     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 = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
-+            compiler_so_cxx = _darwin_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
- 
-@@ -232,23 +242,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 = _darwin_compiler_fixup(linker, ld_args)
\ No newline at end of file
diff --git a/dev-python/pypy/files/2.0-encoder-3655afd07f2f.patch b/dev-python/pypy/files/2.0-encoder-3655afd07f2f.patch
deleted file mode 100644
index bba88c54cbda..000000000000
--- a/dev-python/pypy/files/2.0-encoder-3655afd07f2f.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-# HG changeset patch
-# User Brian Kearns <bdkearns@gmail.com>
-# Date 1360472826 18000
-# Node ID 3655afd07f2fe7e3e7c9f1a94d82fcc0a79fc51a
-# Parent  8556098ab5f036e9ded2549db6989e1206e28f45
-mangle pypy's non-standard JSONEncoder modifications to avoid namespace clashes
-
-diff -r 8556098ab5f036e9ded2549db6989e1206e28f45 -r 3655afd07f2fe7e3e7c9f1a94d82fcc0a79fc51a lib-python/2.7/json/encoder.py
---- a/lib-python/2.7/json/encoder.py	Sat Feb 09 23:27:51 2013 -0500
-+++ b/lib-python/2.7/json/encoder.py	Sun Feb 10 00:07:06 2013 -0500
-@@ -138,16 +138,16 @@
-         self.skipkeys = skipkeys
-         self.ensure_ascii = ensure_ascii
-         if ensure_ascii:
--            self.encoder = raw_encode_basestring_ascii
-+            self.__encoder = raw_encode_basestring_ascii
-         else:
--            self.encoder = raw_encode_basestring
-+            self.__encoder = raw_encode_basestring
-         if encoding != 'utf-8':
--            orig_encoder = self.encoder
-+            orig_encoder = self.__encoder
-             def encoder(o):
-                 if isinstance(o, str):
-                     o = o.decode(encoding)
-                 return orig_encoder(o)
--            self.encoder = encoder
-+            self.__encoder = encoder
-         self.check_circular = check_circular
-         self.allow_nan = allow_nan
-         self.sort_keys = sort_keys
-@@ -193,10 +193,10 @@
-             builder = StringBuilder()
-         else:
-             builder = UnicodeBuilder()
--        self._encode(o, markers, builder, 0)
-+        self.__encode(o, markers, builder, 0)
-         return builder.build()
- 
--    def _emit_indent(self, builder, _current_indent_level):
-+    def __emit_indent(self, builder, _current_indent_level):
-         if self.indent is not None:
-             _current_indent_level += 1
-             newline_indent = '\n' + (' ' * (self.indent *
-@@ -207,15 +207,15 @@
-             separator = self.item_separator
-         return separator, _current_indent_level
- 
--    def _emit_unindent(self, builder, _current_indent_level):
-+    def __emit_unindent(self, builder, _current_indent_level):
-         if self.indent is not None:
-             builder.append('\n')
-             builder.append(' ' * (self.indent * (_current_indent_level - 1)))
- 
--    def _encode(self, o, markers, builder, _current_indent_level):
-+    def __encode(self, o, markers, builder, _current_indent_level):
-         if isinstance(o, basestring):
-             builder.append('"')
--            builder.append(self.encoder(o))
-+            builder.append(self.__encoder(o))
-             builder.append('"')
-         elif o is None:
-             builder.append('null')
-@@ -226,46 +226,46 @@
-         elif isinstance(o, (int, long)):
-             builder.append(str(o))
-         elif isinstance(o, float):
--            builder.append(self._floatstr(o))
-+            builder.append(self.__floatstr(o))
-         elif isinstance(o, (list, tuple)):
-             if not o:
-                 builder.append('[]')
-                 return
--            self._encode_list(o, markers, builder, _current_indent_level)
-+            self.__encode_list(o, markers, builder, _current_indent_level)
-         elif isinstance(o, dict):
-             if not o:
-                 builder.append('{}')
-                 return
--            self._encode_dict(o, markers, builder, _current_indent_level)
-+            self.__encode_dict(o, markers, builder, _current_indent_level)
-         else:
--            self._mark_markers(markers, o)
-+            self.__mark_markers(markers, o)
-             res = self.default(o)
--            self._encode(res, markers, builder, _current_indent_level)
--            self._remove_markers(markers, o)
-+            self.__encode(res, markers, builder, _current_indent_level)
-+            self.__remove_markers(markers, o)
-             return res
- 
--    def _encode_list(self, l, markers, builder, _current_indent_level):
--        self._mark_markers(markers, l)
-+    def __encode_list(self, l, markers, builder, _current_indent_level):
-+        self.__mark_markers(markers, l)
-         builder.append('[')
-         first = True
--        separator, _current_indent_level = self._emit_indent(builder,
-+        separator, _current_indent_level = self.__emit_indent(builder,
-                                                       _current_indent_level)
-         for elem in l:
-             if first:
-                 first = False
-             else:
-                 builder.append(separator)
--            self._encode(elem, markers, builder, _current_indent_level)
-+            self.__encode(elem, markers, builder, _current_indent_level)
-             del elem # XXX grumble
--        self._emit_unindent(builder, _current_indent_level)
-+        self.__emit_unindent(builder, _current_indent_level)
-         builder.append(']')
--        self._remove_markers(markers, l)
-+        self.__remove_markers(markers, l)
- 
--    def _encode_dict(self, d, markers, builder, _current_indent_level):
--        self._mark_markers(markers, d)
-+    def __encode_dict(self, d, markers, builder, _current_indent_level):
-+        self.__mark_markers(markers, d)
-         first = True
-         builder.append('{')
--        separator, _current_indent_level = self._emit_indent(builder,
-+        separator, _current_indent_level = self.__emit_indent(builder,
-                                                          _current_indent_level)
-         if self.sort_keys:
-             items = sorted(d.items(), key=lambda kv: kv[0])
-@@ -282,7 +282,7 @@
-             # JavaScript is weakly typed for these, so it makes sense to
-             # also allow them.  Many encoders seem to do something like this.
-             elif isinstance(key, float):
--                key = self._floatstr(key)
-+                key = self.__floatstr(key)
-             elif key is True:
-                 key = 'true'
-             elif key is False:
-@@ -296,15 +296,15 @@
-             else:
-                 raise TypeError("key " + repr(key) + " is not a string")
-             builder.append('"')
--            builder.append(self.encoder(key))
-+            builder.append(self.__encoder(key))
-             builder.append('"')
-             builder.append(self.key_separator)
--            self._encode(v, markers, builder, _current_indent_level)
-+            self.__encode(v, markers, builder, _current_indent_level)
-             del key
-             del v # XXX grumble
--        self._emit_unindent(builder, _current_indent_level)
-+        self.__emit_unindent(builder, _current_indent_level)
-         builder.append('}')
--        self._remove_markers(markers, d)
-+        self.__remove_markers(markers, d)
- 
-     def iterencode(self, o, _one_shot=False):
-         """Encode the given object and yield each string
-@@ -320,9 +320,9 @@
-             markers = {}
-         else:
-             markers = None
--        return self._iterencode(o, markers, 0)
-+        return self.__iterencode(o, markers, 0)
- 
--    def _floatstr(self, o):
-+    def __floatstr(self, o):
-         # Check for specials.  Note that this type of test is processor
-         # and/or platform-specific, so do tests which don't depend on the
-         # internals.
-@@ -343,21 +343,21 @@
- 
-         return text
- 
--    def _mark_markers(self, markers, o):
-+    def __mark_markers(self, markers, o):
-         if markers is not None:
-             if id(o) in markers:
-                 raise ValueError("Circular reference detected")
-             markers[id(o)] = None
- 
--    def _remove_markers(self, markers, o):
-+    def __remove_markers(self, markers, o):
-         if markers is not None:
-             del markers[id(o)]
- 
--    def _iterencode_list(self, lst, markers, _current_indent_level):
-+    def __iterencode_list(self, lst, markers, _current_indent_level):
-         if not lst:
-             yield '[]'
-             return
--        self._mark_markers(markers, lst)
-+        self.__mark_markers(markers, lst)
-         buf = '['
-         if self.indent is not None:
-             _current_indent_level += 1
-@@ -375,7 +375,7 @@
-             else:
-                 buf = separator
-             if isinstance(value, basestring):
--                yield buf + '"' + self.encoder(value) + '"'
-+                yield buf + '"' + self.__encoder(value) + '"'
-             elif value is None:
-                 yield buf + 'null'
-             elif value is True:
-@@ -385,17 +385,17 @@
-             elif isinstance(value, (int, long)):
-                 yield buf + str(value)
-             elif isinstance(value, float):
--                yield buf + self._floatstr(value)
-+                yield buf + self.__floatstr(value)
-             else:
-                 yield buf
-                 if isinstance(value, (list, tuple)):
--                    chunks = self._iterencode_list(value, markers,
-+                    chunks = self.__iterencode_list(value, markers,
-                                                    _current_indent_level)
-                 elif isinstance(value, dict):
--                    chunks = self._iterencode_dict(value, markers,
-+                    chunks = self.__iterencode_dict(value, markers,
-                                                    _current_indent_level)
-                 else:
--                    chunks = self._iterencode(value, markers,
-+                    chunks = self.__iterencode(value, markers,
-                                               _current_indent_level)
-                 for chunk in chunks:
-                     yield chunk
-@@ -403,13 +403,13 @@
-             _current_indent_level -= 1
-             yield '\n' + (' ' * (self.indent * _current_indent_level))
-         yield ']'
--        self._remove_markers(markers, lst)
-+        self.__remove_markers(markers, lst)
- 
--    def _iterencode_dict(self, dct, markers, _current_indent_level):
-+    def __iterencode_dict(self, dct, markers, _current_indent_level):
-         if not dct:
-             yield '{}'
-             return
--        self._mark_markers(markers, dct)
-+        self.__mark_markers(markers, dct)
-         yield '{'
-         if self.indent is not None:
-             _current_indent_level += 1
-@@ -431,7 +431,7 @@
-             # JavaScript is weakly typed for these, so it makes sense to
-             # also allow them.  Many encoders seem to do something like this.
-             elif isinstance(key, float):
--                key = self._floatstr(key)
-+                key = self.__floatstr(key)
-             elif key is True:
-                 key = 'true'
-             elif key is False:
-@@ -448,10 +448,10 @@
-                 first = False
-             else:
-                 yield item_separator
--            yield '"' + self.encoder(key) + '"'
-+            yield '"' + self.__encoder(key) + '"'
-             yield self.key_separator
-             if isinstance(value, basestring):
--                yield '"' + self.encoder(value) + '"'
-+                yield '"' + self.__encoder(value) + '"'
-             elif value is None:
-                 yield 'null'
-             elif value is True:
-@@ -461,16 +461,16 @@
-             elif isinstance(value, (int, long)):
-                 yield str(value)
-             elif isinstance(value, float):
--                yield self._floatstr(value)
-+                yield self.__floatstr(value)
-             else:
-                 if isinstance(value, (list, tuple)):
--                    chunks = self._iterencode_list(value, markers,
-+                    chunks = self.__iterencode_list(value, markers,
-                                                    _current_indent_level)
-                 elif isinstance(value, dict):
--                    chunks = self._iterencode_dict(value, markers,
-+                    chunks = self.__iterencode_dict(value, markers,
-                                                    _current_indent_level)
-                 else:
--                    chunks = self._iterencode(value, markers,
-+                    chunks = self.__iterencode(value, markers,
-                                               _current_indent_level)
-                 for chunk in chunks:
-                     yield chunk
-@@ -478,11 +478,11 @@
-             _current_indent_level -= 1
-             yield '\n' + (' ' * (self.indent * _current_indent_level))
-         yield '}'
--        self._remove_markers(markers, dct)
-+        self.__remove_markers(markers, dct)
- 
--    def _iterencode(self, o, markers, _current_indent_level):
-+    def __iterencode(self, o, markers, _current_indent_level):
-         if isinstance(o, basestring):
--            yield '"' + self.encoder(o) + '"'
-+            yield '"' + self.__encoder(o) + '"'
-         elif o is None:
-             yield 'null'
-         elif o is True:
-@@ -492,19 +492,19 @@
-         elif isinstance(o, (int, long)):
-             yield str(o)
-         elif isinstance(o, float):
--            yield self._floatstr(o)
-+            yield self.__floatstr(o)
-         elif isinstance(o, (list, tuple)):
--            for chunk in self._iterencode_list(o, markers,
-+            for chunk in self.__iterencode_list(o, markers,
-                                                _current_indent_level):
-                 yield chunk
-         elif isinstance(o, dict):
--            for chunk in self._iterencode_dict(o, markers,
-+            for chunk in self.__iterencode_dict(o, markers,
-                                                _current_indent_level):
-                 yield chunk
-         else:
--            self._mark_markers(markers, o)
-+            self.__mark_markers(markers, o)
-             obj = self.default(o)
--            for chunk in self._iterencode(obj, markers,
-+            for chunk in self.__iterencode(obj, markers,
-                                           _current_indent_level):
-                 yield chunk
--            self._remove_markers(markers, o)
-+            self.__remove_markers(markers, o)
-
diff --git a/dev-python/pypy/files/2.0-no-static-hack-r1.patch b/dev-python/pypy/files/2.0-no-static-hack-r1.patch
deleted file mode 100644
index 98a9633f4d4f..000000000000
--- a/dev-python/pypy/files/2.0-no-static-hack-r1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Remove logic that links to libssl and libcrypto statically if
-possible. Just always link dynamically: Gentoo is expected to have
-sane dynamic libraries for us to use, and our users are not expected
-to copy their pypy binary to a system with an incompatible
-libssl/libcrypto and expect it to work.
-
-Based on patch contributed by XU Benda <heroxbd@gentoo.org>.
-
---- a/rpython/rlib/ropenssl.py
-+++ b/rpython/rlib/ropenssl.py
-@@ -20,27 +20,8 @@
-         # so that openssl/ssl.h can repair this nonsense.
-         'wincrypt.h']
- else:
--    libraries = ['z']
-+    libraries = ['z','ssl','crypto']
-     includes = []
--    if (sys.platform.startswith('linux') and
--        os.path.exists('/usr/lib/libssl.a') and
--        os.path.exists('/usr/lib/libcrypto.a')):
--        # use static linking to avoid the infinite
--        # amount of troubles due to symbol versions
--        # and 0.9.8/1.0.0
--        link_files += ['/usr/lib/libssl.a', '/usr/lib/libcrypto.a']
--        testonly_libraries += ['ssl', 'crypto']
--    elif (sys.platform.startswith('linux') and
--        os.path.exists('/usr/local/ssl/lib/libssl.a') and
--        os.path.exists('/usr/local/ssl/lib/libcrypto.a')):
--        # use static linking, 2nd version
--        include_dirs += ['/usr/local/ssl/include']
--        link_files += ['/usr/local/ssl/lib/libssl.a',
--                       '/usr/local/ssl/lib/libcrypto.a',
--                       '-ldl']
--        testonly_libraries += ['ssl', 'crypto']
--    else:
--        libraries += ['ssl', 'crypto']
- 
- includes += [
-     'openssl/ssl.h', 
diff --git a/dev-python/pypy/files/2.0-no-static-hack.patch b/dev-python/pypy/files/2.0-no-static-hack.patch
deleted file mode 100644
index d78785dc3384..000000000000
--- a/dev-python/pypy/files/2.0-no-static-hack.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Remove logic that links to libssl and libcrypto statically if
-possible. Just always link dynamically: Gentoo is expected to have
-sane dynamic libraries for us to use, and our users are not expected
-to copy their pypy binary to a system with an incompatible
-libssl/libcrypto and expect it to work.
-
-Based on patch contributed by XU Benda <heroxbd@gentoo.org>.
-
---- pypy/rlib/ropenssl.py
-+++ pypy/rlib/ropenssl.py
-@@ -20,27 +20,8 @@
-         # so that openssl/ssl.h can repair this nonsense.
-         'wincrypt.h']
- else:
--    libraries = ['z']
-+    libraries = ['z','ssl','crypto']
-     includes = []
--    if (sys.platform.startswith('linux') and
--        os.path.exists('/usr/lib/libssl.a') and
--        os.path.exists('/usr/lib/libcrypto.a')):
--        # use static linking to avoid the infinite
--        # amount of troubles due to symbol versions
--        # and 0.9.8/1.0.0
--        link_files += ['/usr/lib/libssl.a', '/usr/lib/libcrypto.a']
--        testonly_libraries += ['ssl', 'crypto']
--    elif (sys.platform.startswith('linux') and
--        os.path.exists('/usr/local/ssl/lib/libssl.a') and
--        os.path.exists('/usr/local/ssl/lib/libcrypto.a')):
--        # use static linking, 2nd version
--        include_dirs += ['/usr/local/ssl/include']
--        link_files += ['/usr/local/ssl/lib/libssl.a',
--                       '/usr/local/ssl/lib/libcrypto.a',
--                       '-ldl']
--        testonly_libraries += ['ssl', 'crypto']
--    else:
--        libraries += ['ssl', 'crypto']
- 
- includes += [
-     'openssl/ssl.h', 
diff --git a/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch b/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch
deleted file mode 100644
index 1252d27cfd2a..000000000000
--- a/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch
+++ /dev/null
@@ -1,391 +0,0 @@
---- lib-python/modified-2.7/distutils/ccompiler.py
-+++ lib-python/modified-2.7/distutils/ccompiler.py
-@@ -27,10 +27,16 @@
-     varies across Unices and is stored in Python's Makefile.
-     """
-     if compiler.compiler_type == "unix":
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
--            _sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                                       'CCSHARED', 'LDSHARED', 'SO', 'AR',
--                                       'ARFLAGS')
-+        cc = ' '.join(compiler.compiler)
-+        cxx = ' '.join(compiler.compiler_cxx)
-+        ldshared = ' '.join(compiler.linker_so)
-+        ldcxxshared = ' '.join(compiler.linker_so_cxx)
-+        ar = compiler.archiver[0]
-+
-+        cflags = ''
-+        cxxflags = ''
-+        ccshared = '-fPIC'
-+        ar_flags = compiler.archiver[1]
- 
-         if 'CC' in os.environ:
-             cc = os.environ['CC']
-@@ -38,19 +44,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:
-@@ -59,17 +73,19 @@
-             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
--
- class CCompiler:
-     """Abstract base class to define the interface that must be implemented
-     by real compiler classes.  Also has some utility methods used by
---- lib-python/modified-2.7/distutils/cygwinccompiler.py
-+++ lib-python/modified-2.7/distutils/cygwinccompiler.py
-@@ -135,9 +135,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, shared_option)))
- 
-         # cygwin and mingw32 need different sets of libraries
-         if self.gcc_version == "2.91.57":
-@@ -163,8 +167,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
- 
-@@ -325,10 +333,15 @@
-         self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
-                              compiler_so='gcc -mno-cygwin -mdll -O -Wall',
-                              compiler_cxx='g++ -mno-cygwin -O -Wall',
-+                             compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
-                              linker_exe='gcc -mno-cygwin',
-                              linker_so='%s -mno-cygwin %s %s'
-                                         % (self.linker_dll, shared_option,
--                                           entry_point))
-+                                           entry_point),
-+                             linker_exe_cxx='g++ -mno-cygwin',
-+                             linker_so_cxx='%s -mno-cygwin %s %s'
-+                                            % (self.linker_dll, shared_option,
-+                                               entry_point))
-         # Maybe we should also append -mthreads, but then the finished
-         # dlls need another dll (mingwm10.dll see Mingw32 docs)
-         # (-mthreads: Support thread-safe exception handling on `Mingw32')
---- lib-python/modified-2.7/distutils/emxccompiler.py
-+++ lib-python/modified-2.7/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-python/modified-2.7/distutils/sysconfig_cpython.py
-+++ lib-python/modified-2.7/distutils/sysconfig_cpython.py
-@@ -149,9 +149,12 @@
-     varies across Unices and is stored in Python's Makefile.
-     """
-     if compiler.compiler_type == "unix":
--        (cc, cxx, opt, cflags, ccshared, ldshared, so_ext) = \
--            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
--                            'CCSHARED', 'LDSHARED', 'SO')
-+        (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext) = \
-+            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED',
-+                            'LDCXXSHARED', 'SO')
-+
-+        cflags = ''
-+        cxxflags = ''
- 
-         if 'CC' in os.environ:
-             cc = os.environ['CC']
-@@ -159,28 +162,40 @@
-             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']
- 
-         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_exe=cc,
-+            linker_so_cxx=ldcxxshared,
-+            linker_exe_cxx=cxx)
- 
-         compiler.shared_lib_extension = so_ext
- 
-@@ -506,7 +521,7 @@
-                 for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                         # a number of derived variables. These need to be
-                         # patched up as well.
--                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-+                        'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-                     flags = _config_vars[key]
-                     flags = re.sub('-arch\s+\w+\s', ' ', flags)
-                     flags = re.sub('-isysroot [^ \t]*', ' ', flags)
-@@ -525,7 +540,7 @@
-                     for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                         # a number of derived variables. These need to be
-                         # patched up as well.
--                        'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-+                        'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
- 
-                         flags = _config_vars[key]
-                         flags = re.sub('-arch\s+\w+\s', ' ', flags)
-@@ -549,7 +564,7 @@
-                         for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED',
-                              # a number of derived variables. These need to be
-                              # patched up as well.
--                            'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-+                            'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
- 
-                             flags = _config_vars[key]
-                             flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags)
---- lib-python/modified-2.7/distutils/sysconfig_pypy.py
-+++ lib-python/modified-2.7/distutils/sysconfig_pypy.py
-@@ -114,13 +114,56 @@
-     optional C speedup components.
-     """
-     if compiler.compiler_type == "unix":
--        compiler.compiler_so.extend(['-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 "CFLAGS" in os.environ:
--            cflags = os.environ["CFLAGS"]
--            compiler.compiler.append(cflags)
--            compiler.compiler_so.append(cflags)
--            compiler.linker_so.append(cflags)
- 
- 
- from sysconfig_cpython import (
---- lib-python/modified-2.7/distutils/unixccompiler.py
-+++ lib-python/modified-2.7/distutils/unixccompiler.py
-@@ -114,14 +114,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":
-@@ -186,11 +189,18 @@
- 
-     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 = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
-+            compiler_so_cxx = _darwin_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
- 
-@@ -247,23 +257,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 = _darwin_compiler_fixup(linker, ld_args)
diff --git a/dev-python/pypy/files/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy/files/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
deleted file mode 100644
index 4422824aa271..000000000000
--- a/dev-python/pypy/files/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-python/modified-2.7/distutils/unixccompiler.py
-+++ lib-python/modified-2.7/distutils/unixccompiler.py
-@@ -297,7 +297,7 @@
-         # this time, there's no way to determine this information from
-         # the configuration data stored in the Python installation, so
-         # we use this hack.
--        compiler = os.path.basename(sysconfig.get_config_var("CC"))
-+        compiler = os.path.basename(self.compiler[0])
-         if sys.platform[:6] == "darwin":
-             # MacOSX's linker doesn't understand the -R flag at all
-             return "-L" + dir
diff --git a/dev-python/pypy/pypy-1.9-r1.ebuild b/dev-python/pypy/pypy-1.9-r1.ebuild
deleted file mode 100644
index 0a1309b16dee..000000000000
--- a/dev-python/pypy/pypy-1.9-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.9-r1.ebuild,v 1.3 2012/11/18 02:06:28 floppym Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs check-reqs python versionator multiprocessing
-
-DESCRIPTION="PyPy is a fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV}.tar.bz2 -> ${P}.tar.bz2"
-SLOTVER=$(get_version_component_range 1-2 ${PV})
-
-LICENSE="MIT"
-SLOT="${SLOTVER}"
-PYTHON_ABI="2.7-pypy-${SLOTVER}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-		virtual/libffi
-		virtual/libintl
-		dev-libs/expat
-		bzip2? ( app-arch/bzip2 )
-		ncurses? ( sys-libs/ncurses )
-		sqlite? ( dev-db/sqlite:3 )
-		ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-PDEPEND="app-admin/python-updater"
-
-pkg_pretend() {
-	CHECKREQS_MEMORY="2G"
-	use amd64 && CHECKREQS_MEMORY="4G"
-	check-reqs_pkg_pretend
-}
-
-src_unpack() {
-	default
-	mv pypy-pypy-* "${S}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-no-bytecode-4151f9c406b6.patch"
-	epatch "${FILESDIR}/${PV}-scripts-location.patch"
-	epatch "${FILESDIR}/${PV}-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	epatch "${FILESDIR}/${PV}-distutils-fix_handling_of_executables_and_flags.patch"
-	epatch "${FILESDIR}/${PV}-ssl-threads-1-34b3b5aac082.patch"
-	epatch "${FILESDIR}/${PV}-ssl-threads-2-25cd11066d95.patch"
-	epatch "${FILESDIR}/${PV}-get_python_lib_standard_lib-04ea518e5b71.patch"
-	epatch "${FILESDIR}/${PV}-more-ignored-ops-a9a8faa76bca.patch"
-	epatch "${FILESDIR}/${PV}-more-ignored-ops-146ddf82a279.patch"
-	epatch "${FILESDIR}/${PV}-pybuffer-release-double-decref-4ec2a5b49386.patch"
-	epatch "${FILESDIR}/${PV}-signal-a33052b17f4e.patch"
-	epatch "${FILESDIR}/${PV}-getargs-freelist-c26dc70ee340.patch"
-	epatch "${FILESDIR}/${PV}-ssl-errors-25d3418150d2.patch"
-
-	# The following is Gentoo-specific.
-	epatch "${FILESDIR}/${PV}-no-static-hack.patch"
-}
-
-src_compile() {
-	local conf
-	if use jit; then
-		conf="-Ojit"
-	else
-		conf="-O2"
-	fi
-	if use shadowstack; then
-		conf+=" --gcrootfinder=shadowstack"
-	fi
-	if use sandbox; then
-		conf+=" --sandbox"
-	fi
-
-	conf+=" --make-jobs=$(makeopts_jobs)"
-
-	conf+=" ./pypy/translator/goal/targetpypystandalone.py"
-	# Avoid linking against libraries disabled by use flags
-	local optional_use=("bzip2" "ncurses" "ssl")
-	local optional_mod=("bz2" "_minimal_curses" "_ssl")
-	for ((i = 0; i < ${#optional_use[*]}; i++)); do
-		if use ${optional_use[$i]};	then
-			conf+=" --withmod-${optional_mod[$i]}"
-		else
-			conf+=" --withoutmod-${optional_mod[$i]}"
-		fi
-	done
-
-	local translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py --batch $conf"
-	echo ${_BOLD}"${translate_cmd}"${_NORMAL}
-	${translate_cmd} || die "compile error"
-}
-
-src_install() {
-	local INSPATH="/usr/$(get_libdir)/pypy${SLOT}"
-	insinto ${INSPATH}
-	doins -r include lib_pypy lib-python pypy-c
-	fperms a+x ${INSPATH}/pypy-c
-	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
-	dodoc README
-
-	if ! use sqlite; then
-		rm -fr "${ED}${INSPATH}/lib-python/2.7/sqlite3"
-		rm -fr "${ED}${INSPATH}/lib-python/modified-2.7/sqlite3"
-		rm -f "${ED}${INSPATH}/lib_pypy/_sqlite3.py"
-	fi
-
-	# Generate Grammar and PatternGrammar pickles.
-	PYTHONPATH="${ED}${INSPATH}/lib_pypy/__extensions__:${ED}${INSPATH}/lib_pypy:${ED}${INSPATH}/lib-python/modified-2.7:${ED}${INSPATH}/lib-python/2.7" "${ED}${INSPATH}/pypy-c" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" || die "Generation of Grammar and PatternGrammar pickles failed"
-}
-
-src_test() {
-	$(PYTHON -2) ./pypy/test_all.py --pypy=./pypy-c lib-python
-}
diff --git a/dev-python/pypy/pypy-1.9.ebuild b/dev-python/pypy/pypy-1.9.ebuild
deleted file mode 100644
index 6fab91baa731..000000000000
--- a/dev-python/pypy/pypy-1.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.9.ebuild,v 1.2 2012/11/18 02:06:28 floppym Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs check-reqs python versionator
-
-DESCRIPTION="PyPy is a fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV}.tar.bz2 -> ${P}.tar.bz2"
-SLOTVER=$(get_version_component_range 1-2 ${PV})
-
-LICENSE="MIT"
-SLOT="${SLOTVER}"
-PYTHON_ABI="2.7-pypy-${SLOTVER}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-		virtual/libffi
-		virtual/libintl
-		dev-libs/expat
-		bzip2? ( app-arch/bzip2 )
-		ncurses? ( sys-libs/ncurses )
-		sqlite? ( dev-db/sqlite:3 )
-		ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-PDEPEND="app-admin/python-updater"
-
-pkg_pretend() {
-	CHECKREQS_MEMORY="2G"
-	use amd64 && CHECKREQS_MEMORY="4G"
-	check-reqs_pkg_pretend
-}
-
-src_unpack() {
-	default
-	mv pypy-pypy-* "${S}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-no-bytecode-4151f9c406b6.patch"
-	epatch "${FILESDIR}/${PV}-scripts-location.patch"
-	epatch "${FILESDIR}/${PV}-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	epatch "${FILESDIR}/${PV}-distutils-fix_handling_of_executables_and_flags.patch"
-}
-
-src_compile() {
-	local conf
-	if use jit; then
-		conf="-Ojit"
-	else
-		conf="-O2"
-	fi
-	if use shadowstack; then
-		conf+=" --gcrootfinder=shadowstack"
-	fi
-	if use sandbox; then
-		conf+=" --sandbox"
-	fi
-
-	conf+=" ./pypy/translator/goal/targetpypystandalone.py"
-	# Avoid linking against libraries disabled by use flags
-	local optional_use=("bzip2" "ncurses" "ssl")
-	local optional_mod=("bz2" "_minimal_curses" "_ssl")
-	for ((i = 0; i < ${#optional_use[*]}; i++)); do
-		if use ${optional_use[$i]};	then
-			conf+=" --withmod-${optional_mod[$i]}"
-		else
-			conf+=" --withoutmod-${optional_mod[$i]}"
-		fi
-	done
-
-	local translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py --batch $conf"
-	echo ${_BOLD}"${translate_cmd}"${_NORMAL}
-	${translate_cmd} || die "compile error"
-}
-
-src_install() {
-	local INSPATH="/usr/$(get_libdir)/pypy${SLOT}"
-	insinto ${INSPATH}
-	doins -r include lib_pypy lib-python pypy-c
-	fperms a+x ${INSPATH}/pypy-c
-	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
-	dodoc README
-
-	if ! use sqlite; then
-		rm -fr "${ED}${INSPATH}/lib-python/2.7/sqlite3"
-		rm -fr "${ED}${INSPATH}/lib-python/modified-2.7/sqlite3"
-		rm -f "${ED}${INSPATH}/lib_pypy/_sqlite3.py"
-	fi
-
-	# Generate Grammar and PatternGrammar pickles.
-	PYTHONPATH="${ED}${INSPATH}/lib_pypy/__extensions__:${ED}${INSPATH}/lib_pypy:${ED}${INSPATH}/lib-python/modified-2.7:${ED}${INSPATH}/lib-python/2.7" "${ED}${INSPATH}/pypy-c" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" || die "Generation of Grammar and PatternGrammar pickles failed"
-}
-
-src_test() {
-	$(PYTHON -2) ./pypy/test_all.py --pypy=./pypy-c lib-python
-}
diff --git a/dev-python/pypy/pypy-2.0_beta1.ebuild b/dev-python/pypy/pypy-2.0_beta1.ebuild
deleted file mode 100644
index fe2d69c929b8..000000000000
--- a/dev-python/pypy/pypy-2.0_beta1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0_beta1.ebuild,v 1.5 2013/02/21 15:25:39 idella4 Exp $
-
-EAPI=5
-
-# XXX: test other implementations
-PYTHON_COMPAT=( python2_7 pypy{1_8,1_9,2_0} )
-inherit check-reqs eutils multilib multiprocessing python-any-r1 toolchain-funcs vcs-snapshot versionator
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV/_beta/-beta-}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT=$(get_version_component_range 1-2 ${PV})
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	dev-libs/expat
-	bzip2? ( app-arch/bzip2 )
-	ncurses? ( sys-libs/ncurses )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-PDEPEND="app-admin/python-updater"
-
-pkg_pretend() {
-	CHECKREQS_MEMORY="2G"
-	use amd64 && CHECKREQS_MEMORY="4G"
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	pkg_pretend
-	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"
-	epatch "${FILESDIR}/2.0-distutils-fix_handling_of_executables_and_flags.patch" \
-		"${FILESDIR}"/2.0-encoder-3655afd07f2f.patch
-
-	# The following is Gentoo-specific.
-	epatch "${FILESDIR}/2.0-no-static-hack.patch"
-}
-
-src_compile() {
-	tc-export CC
-
-	local args=(
-		$(usex jit -Ojit -O2)
-		$(usex shadowstack --gcrootfinder=shadowstack '')
-		$(usex sandbox --sandbox '')
-
-		--make-jobs=$(makeopts_jobs)
-
-		./pypy/translator/goal/targetpypystandalone.py
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-		ssl:_ssl
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	set -- "${PYTHON}" ./pypy/translator/goal/translate.py --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-}
-
-src_install() {
-	local INSDESTTREE=/usr/$(get_libdir)/pypy${SLOT}
-	doins -r include lib_pypy lib-python pypy-c
-	fperms a+x ${INSDESTTREE}/pypy-c
-	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
-	dodoc README
-
-	if ! use sqlite; then
-		rm -fr "${ED}${INSDESTTREE}"/lib-python/{2.7,modified-2.7}/sqlite3
-		rm -f "${ED}${INSDESTTREE}"/lib_pypy/_sqlite3.py
-	fi
-
-	python_export pypy-c${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=${ED}${INSDESTTREE}/pypy-c
-	fi
-
-	# Generate Grammar and PatternGrammar pickles.
-	PYTHONPATH="${ED}${INSDESTTREE}/lib-python/2.7" \
-		"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# compile the installed modules
-	python_optimize "${ED}${INSDESTTREE}"
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-src_test() {
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python
-}
diff --git a/dev-python/pypy/pypy-2.0_beta2.ebuild b/dev-python/pypy/pypy-2.0_beta2.ebuild
deleted file mode 100644
index 036c8549bf4e..000000000000
--- a/dev-python/pypy/pypy-2.0_beta2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0_beta2.ebuild,v 1.6 2013/05/14 14:27:38 floppym Exp $
-
-EAPI=5
-
-# XXX: test other implementations
-PYTHON_COMPAT=( python2_7 pypy{1_8,1_9,2_0} )
-inherit check-reqs eutils flag-o-matic multilib multiprocessing python-any-r1 toolchain-funcs vcs-snapshot versionator
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV/_/-}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT=$(get_version_component_range 1-2 ${PV})
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	dev-libs/expat
-	bzip2? ( app-arch/bzip2 )
-	ncurses? ( sys-libs/ncurses )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-PDEPEND="app-admin/python-updater"
-
-pkg_pretend() {
-	CHECKREQS_MEMORY="2G"
-	use amd64 && CHECKREQS_MEMORY="4G"
-	check-reqs_pkg_pretend
-	if [[ ${MERGE_TYPE} != binary && "$(gcc-version)" == "4.8" ]]; then
-		die "PyPy does not build correctly with GCC 4.8"
-	fi
-}
-
-pkg_setup() {
-	pkg_pretend
-	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"
-	epatch "${FILESDIR}/2.0-distutils-fix_handling_of_executables_and_flags.patch"
-
-	# The following is Gentoo-specific.
-	epatch "${FILESDIR}/2.0-no-static-hack-r1.patch"
-}
-
-src_compile() {
-	tc-export CC
-
-	if version_is_at_least 4.8 "$(gcc-version)"; then
-		# Workaround per PyPy docs
-		# http://pypy.org/download.html#building-from-source
-		append-cflags -fno-aggressive-loop-optimizations
-	fi
-
-	local args=(
-		$(usex jit -Ojit -O2)
-		$(usex shadowstack --gcrootfinder=shadowstack '')
-		$(usex sandbox --sandbox '')
-
-		--make-jobs=$(makeopts_jobs)
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-		ssl:_ssl
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	set -- "${PYTHON}" rpython/bin/rpython --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/pypy${SLOT}"
-	doins -r include lib_pypy lib-python pypy-c
-	fperms a+x ${INSDESTTREE}/pypy-c
-	use jit && pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
-	dodoc README.rst
-
-	if ! use sqlite; then
-		rm -fr "${ED%/}${INSDESTTREE}"/lib-python/{2.7,modified-2.7}/sqlite3
-		rm -f "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py
-	fi
-
-	python_export pypy-c${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
-	# if not using a cross-compiler, use the fresh binary
-	if ! tc-is-cross-compiler; then
-		local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
-	fi
-
-	runpython() {
-		PYTHONPATH="${ED%/}${INSDESTTREE}/lib_pypy:${ED%/}${INSDESTTREE}/lib-python/2.7" \
-			"${PYTHON}" "$@"
-	}
-
-	# Generate Grammar and PatternGrammar pickles.
-	runpython -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi cache
-	runpython -c "import _curses" || die "Failed to import _curses"
-	if use sqlite; then
-		runpython -c "import _sqlite3" || die "Failed to import _sqlite3"
-	fi
-
-	# compile the installed modules
-	python_optimize "${ED%/}${INSDESTTREE}"
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
-}
-
-src_test() {
-	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python
-}