Revert the gdbm change. I was wrong, and _gdbm is only in PyPy 3.

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

4 files changed, 26 insertions, 22 deletions

diff --git a/dev-python/pypy-bin/ChangeLog b/dev-python/pypy-bin/ChangeLog
index 7da47c435404..c9c265f63067 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.25 2014/11/05 18:13:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.26 2014/11/05 21:18:12 mgorny Exp $
+
+  05 Nov 2014; Michał Górny <mgorny@gentoo.org> pypy-bin-2.3.1-r2.ebuild,
+  pypy-bin-2.4.0.ebuild:
+  Revert the gdbm change. I was wrong, and _gdbm is only in PyPy 3.
 
   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 d694be63e5ce..306b19e17686 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -36,26 +36,26 @@ DIST pypy-bin-2.4.0-r1-amd64+bzip2+jit+ncurses.tar.xz 11639092 SHA256 77d4377adb
 DIST pypy-bin-2.4.0-r1-amd64+bzip2+ncurses.tar.xz 6603856 SHA256 6670aa2e074e1308c7dc7d8d616a3c7bf59af479eb83c1fd9d40dccecd2019d8 SHA512 7510ae4ae9e2bf428adb57beec12f50a910af121f5df8f4f0b5545c309969393b499d63ed4f4a8cf7fd0e9a2ca924bb14bd45fee0bdb122a8edb9ba9e39382bc WHIRLPOOL ad26729e8bbe4cd291f1e826ad221a17f922bd063f521d73db992334a33f94f26ee3aaaebc6e2ed4870f7505d97ad443b45a4d80e5ec6d6708569d23dd0bdbfc
 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 5591 SHA256 d0a82cb8e04304e50ba7dd8934f7a852889ad726c2c4c51df94ab333bffafb50 SHA512 8b8cfff93cf2d8ff7e2ae4ba858af126df0dc6698e0428ce60f8dc90ccd38e00c18d511df7b546630682665f8a600c5d28afb2b7ac324922475be80b32dd8d6e WHIRLPOOL f7a5e64246b7983a5d156f7ab0e42a40a5d6e868cd5036a6dc0386d90493586c281359fe4fc7b1ff0020aad0f849127c3af261ab57478a120acf87616e30ebc5
-EBUILD pypy-bin-2.4.0.ebuild 5785 SHA256 98245e19245c2c81bf5103eb12ff8e29c36485d4d3212756bec92c9e6c101149 SHA512 788659c8bb4b651d17cdf7341b23b9cc967ccbfb363e1f3c720d6fb4945c15bad80a9bca0baee19cce8b8a418c3f1252bbaff16feb90c680c025b5bdbf8e96f4 WHIRLPOOL 4c004c13448339999b6f506e86936c77674c8a901dbeaffa73eca7a40f114c67f4b0732a854fce2ea27f4d55f6c21a338c5244446d0b08517c61b92e2ccb2b8a
-MISC ChangeLog 5493 SHA256 b236eeb2ac1c0835d34ddd5d24ead53e4c4c38e9ffedbcf94e32cbdd8cc5db70 SHA512 596d85d416a4dff93c95486649c268f5d7fc60bfbaf12315837256da71f3f0e80aee633bb8759f37bb56d103a065a8caa437bf7a59a65abe99fcfeca85c5bdbc WHIRLPOOL 828e299bd989cdd7368c23b328602d4e95f8ebc4dc6a2063f2ea063c31fe3a076532cb277381c7a7f03e96fd2abc542ba1c8728b66e70decbf5f97268f36977f
+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
 MISC metadata.xml 428 SHA256 99cbecab117f387c279567957835aa68a397906b2309e9c9b8feb80d10812899 SHA512 fda6cede1be6fe8c7d1cbaceebe3193cd16102ad2a570afb1a2269c02ee3021ed9130fc8b09e9f6c5cf742afa95af6864577030b3eaeb41ea29a500826bf7260 WHIRLPOOL 2d765c32b3534dd8fedeee10ea0e3cfcf22fd51121046009a5196ce206dbaf1625f363e8b6dcf3798c6a185de90f27fe06e73b755ad27723ecd8c8bf3ff13ca8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUWmjcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUWpQXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOiRoP/iXwFr0vxYzcC8G3swGQxTBc
-8lRmBzk271g8vUlhWHOKQkO+0tTMK7DoA6PjyDKF+pNTvvMzt2xHr3YZ4QJzm+1t
-fLZUPB81ZaxIXuBT9hqzlMuLRKireGbM9DQ1GSW+VErlxOQbjY4ILrQS/1dx5uO2
-9wD1hQXUL/14A4Es2ZDBGWhF/8FAdxkbZR0/864rtl8qgIKKDCMNjpTo2XDriGGu
-eEuAs0l8qzc2Lq9D4EhKzdPwTzlYJkcWaEJjBvv0zcCtu5u2N3G68VkiJgSfJ0Gu
-xT0NAPzD9rEhA2ISf3C+qJzPI9J+lt5f4Az3/JAf4AHeGZGcUVM8IwpdboEcOnbA
-KHqZjYMBm9TtdbE3hqI/dwTHMwU3EFIcCyXQZHhxzcnmRbcHIQiW1vVS9syoFgBB
-9X9wiQkTA2hkpIip35cCevevsG/3Wy8QUFTRb01b8Qml08BshW63ehSHgeSAI9df
-1PVSv7MZplXI9D3o9d4jNceRrrm9V6snQuPoT+2aG9qY5eb2W3UzEm3YBs2oXxo8
-FQeVRrsdXTBQadOvWQvTLb1l5yFBhU9+/T061qJ5bPK1s3OZX3gLQ5KMgdezx/JN
-6YGRaj1RCHIXcrcMowaShX+P3swCbAk5Jz+gBnOtb7hLvT2NHy7GC+oTJYzWpQ9q
-zxWUNQY23Cf+z4MiUXH5
-=gcGV
+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
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild b/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild
index e26afc57537d..3165c37af4fe 100644
--- a/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild,v 1.2 2014/11/05 18:13:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild,v 1.3 2014/11/05 21:18:12 mgorny Exp $
 
 EAPI=5
 
@@ -165,7 +165,7 @@ src_install() {
 	"${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
 	"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
 	if use gdbm; then
-		"${PYTHON}" -c "import _gdbm" || die "Failed to import gdbm (cffi)"
+		"${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)"
 	fi
 	if use sqlite; then
 		"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
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 c40fabcd6aeb..6c7e19734204 100644
--- a/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild,v 1.4 2014/11/05 18:13:43 mgorny Exp $
+# $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 $
 
 EAPI=5
 
@@ -171,7 +171,7 @@ src_install() {
 	"${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
 	"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
 	if use gdbm; then
-		"${PYTHON}" -c "import _gdbm" || die "Failed to import gdbm (cffi)"
+		"${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)"
 	fi
 	if use sqlite; then
 		"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"