diff -Naurp pypy.old/files/pypy-1.9-no-static-hack.patch pypy/files/pypy-1.9-no-static-hack.patch
--- pypy.old/files/pypy-1.9-no-static-hack.patch	1970-01-01 09:00:00.000000000 +0900
+++ pypy/files/pypy-1.9-no-static-hack.patch	2012-06-10 17:35:47.000000000 +0900
@@ -0,0 +1,22 @@
+--- pypy/rlib/ropenssl.py	2012-06-07 21:24:48.000000000 +0900
++++ pypy/rlib/ropenssl.py.new	2012-06-10 17:28:29.000000000 +0900
+@@ -19,18 +19,8 @@ if sys.platform == 'win32' and platform.
+         # 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']
+-    else:
+-        libraries += ['ssl', 'crypto']
+ 
+ includes += [
+     'openssl/ssl.h', 
diff -Naurp pypy.old/Manifest pypy/Manifest
--- pypy.old/Manifest	2012-06-09 02:08:04.000000000 +0900
+++ pypy/Manifest	2012-06-10 19:35:34.000000000 +0900
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 1.7-scripts-location.patch 412 RMD160 811c3cc38370f97274f8ec5cc36f34b3e79dae56 SHA1 c03fa9679443ed9461829745f5bb00cfecd3eb22 SHA256 abc39fbbf69d1d6b478a4a16626950e8e0b607fb05c6e1e1c10618c59fccdda9
 AUX 1.8-elf-metadata-26a8d3fc57a7.patch 569 RMD160 de5a440cb41ab0249141304c12f9a35af1565c87 SHA1 57daa224b13ec3e6cf7f23d02d896527137dca6b SHA256 8c695811ca9eae7d3b81674e8de255dc84e242972041ca54093a3d96f40fe34b
 AUX 1.8-sext-instructions-02dc2f6160ee.patch 1100 RMD160 c1f83411a70af07c0987ac51c81806de70a5d991 SHA1 8430932adfaadf903a1ad5a4635644157e04ee78 SHA256 599af03fb41902cb00b6c1768febd921276efbdc7b550d010676cc210f7564bb
@@ -10,16 +7,10 @@ AUX 1.9-no-bytecode-4151f9c406b6.patch 1
 AUX 1.9-scripts-location.patch 394 RMD160 e0324dd7cbdf0508c12cd63c2620f9d001e81ef6 SHA1 98b0e6e9182e38020fa9f95445bf27358c7f0356 SHA256 d02ef738b6c82a7a671b50bdc5dc623887e97c3cb033c11ea997b88e6ccb8bdc
 AUX pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch 18064 RMD160 8e86cff09340448f3e49ccc626efa40e9463273a SHA1 533cad04bc8d96e2ba1a09e8249a3efd97e46b1d SHA256 43cbabdf5f7b094eb969c754bb6513fa324b1fadb40b37d78bd1ad47194d787a
 AUX pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 569 RMD160 540aa0881ea1fef56cea3734fa09f5c3366d5bb0 SHA1 5f4939129a9a56c9f9da0e82851f675fd7c73209 SHA256 55ea809a5f3e264b1905b06aa3af78aae149451e7d74a98d11e87629ab69493e
+AUX pypy-1.9-no-static-hack.patch 845 RMD160 300a5233e66815826c0b1ebbfedd51db2dee8c55 SHA1 099402f0602f09bfa263be5619cd791718e48a64 SHA256 cc96fe665c689ab079fa317e5d059c07e96884e47affe5279faea239ec349d7e
 DIST pypy-1.8.tar.bz2 14927806 RMD160 70fe569b466357ee64685c8ce15278d24862c711 SHA1 4ff684619671d6076879eff88343184d7656c699 SHA256 ac98ad6d884207f8325ff4c783104ebea57a3fcddfef32abcdf97fd4307b6287
 DIST pypy-1.9.tar.bz2 13466551 RMD160 8ac2f53330ae450650f05753985bdbb42e07b526 SHA1 36a05432bbcee5d92a320fa27a627aeb281086b4 SHA256 9fd599acade49ef98017bbce4f179f19cf2680489ff15235d3bad5b20bde0d68
 EBUILD pypy-1.8-r1.ebuild 3156 RMD160 41bba9d37e47db4788bb3901c04c6cc5f210bdbd SHA1 2aef475bdd408dcd042f2c0fb865750a665963e2 SHA256 b97521f03d18b5a9fb5584dad78bf246e50a8712768b8684b2b8c1b9ba54ac80
-EBUILD pypy-1.9.ebuild 3079 RMD160 08231c844fd0c35271bc7b70632eaebe8299b6d4 SHA1 bad2edbe77404a2c6451cb006dbc1e41fac3a367 SHA256 7bb7ed6e7d4f7229383e0c74bedc2ef2e85625826ff7ad567430de88f17a9a81
+EBUILD pypy-1.9.ebuild 3151 RMD160 4301f974a0d9b069866b186b36b1d63c6733de06 SHA1 0b49a9700e8d17e85e80c56091008f8e7496b529 SHA256 713386b32b5e392e996e4704bfd993df901b2a01d82f9c2d79038007225de903
 MISC ChangeLog 3670 RMD160 c06ae32b25e359d73ca5e966fd537bffa24e8259 SHA1 7fbc1e9320a69894ca70af639a0e30a9c022fc5f SHA256 0a1bbeb70bf3b0e3482120a5fe98568a32a2d1a7ee1eb99dc4fa62680d8791be
 MISC metadata.xml 434 RMD160 3c90cc70db73e1645c0a82a093084551e80ad311 SHA1 8942b6dc54c073f17f49afac40b6bad056692571 SHA256 2af0a575ae6cb4c00383bdb8a22774b3d5bc988c7f48cbcdddef781234fc54e5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk/SLcUACgkQxeMuLWsGW/v0MgCeJtdGkro0HnKjtg9H7pdOtDMq
-bVsAoKpJc+pBXXVysgqYmD17JMHTSo3E
-=zdjd
------END PGP SIGNATURE-----
diff -Naurp pypy.old/pypy-1.9.ebuild pypy/pypy-1.9.ebuild
--- pypy.old/pypy-1.9.ebuild	2012-06-09 01:52:09.000000000 +0900
+++ pypy/pypy-1.9.ebuild	2012-06-10 19:35:34.000000000 +0900
@@ -14,7 +14,7 @@ SLOTVER=$(get_version_component_range 1-
 LICENSE="MIT"
 SLOT="${SLOTVER}"
 PYTHON_ABI="2.7-pypy-${SLOTVER}"
-KEYWORDS="~amd64 ~x86"
+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
@@ -46,6 +46,7 @@ src_prepare() {
 	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}/${P}-no-static-hack.patch"
 }
 
 src_compile() {