Fix gdbm support, bug #519696. Add subslots in deps.

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

4 files changed, 77 insertions, 31 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 317d9f808373..43c044237b62 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pypy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.71 2014/10/20 02:15:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.72 2014/11/04 15:04:44 mgorny Exp $
+
+*pypy-2.3.1-r2 (04 Nov 2014)
+
+  04 Nov 2014; Michał Górny <mgorny@gentoo.org> +pypy-2.3.1-r2.ebuild,
+  -pypy-2.3.1-r1.ebuild, pypy-2.4.0.ebuild:
+  Fix gdbm support, bug #519696. Add subslots in deps.
 
 *pypy-2.4.0 (20 Oct 2014)
 
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index c40d598c8a5a..16baefb9fe46 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 SHA256 110c15482123bc6fbf11e237df30eb0daad7f6032e2f73903e9e3c225121737a SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474 WHIRLPOOL 14084d22388b2bbda7fbd19195f448265f99b1437b7cefdac276ccab52785c67b71768303e1d1ea9009f8533ba07de0014eb237b4de675cf8dbc1acbeacb8508
 AUX 1.9-scripts-location.patch 354 SHA256 efceb2fabe7e2a9ca8cc3d8b86653d19b1a7e729c01ce70486da597f1fe9b1a0 SHA512 739f3620cf5c71d292e9a4c8cd2341184961313f42a23d794e2031ea165d82fab9628924800425fa70d27b3fd759138f62bf04345654c97ee1883bb069d8d261 WHIRLPOOL 6e607663498bf62d39cf420a586a82cad4c7ba660228987133c0ba9ebec3a20257e7dccb677815a0ad886de466cad79daa79dc8a434a52b21d44e84f46c00830
 AUX 2.0.2-distutils-fix_handling_of_executables_and_flags.patch 15226 SHA256 ff9af8fc2ee17c9ef9a239fb7f728245ccf6533559b8d8e94197db9decf21c60 SHA512 cb7cc7bc2d9e72b18dc022b7fb9605a3af2d0f8e192af9b420315e772861a2082f6dfd0d0b969b8916635e3b57e78ead9c9707258c4e7ae5fb4f175685204868 WHIRLPOOL 219bc0fa734e319e3f9102b2c860a3163acdf5d7b65a5bc4799c898f36c8816ed6847317b18f79e91de322d740f676f3dc3ba1e65934f382dcfe36f67f8a110d
@@ -10,7 +13,26 @@ DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91
 DIST pypy-2.4.0-src.tar.bz2 15390145 SHA256 7e0dec2c40106f20f002121bdabb71939915254fb91bd55b01434e4b994113d2 SHA512 b6e0c48a16e842374c400dcf6cbb01eebb33fee35804540d3aec52d2612c4093a9c57f3b2569176784b9b6ba8af428c0c238ff6db45a1773d8edbc44cc615598 WHIRLPOOL 8d80c89d3026215ebea3893f3c37dc431ae9ed3c381f3faae12c7cd25a2bb7beba583f8aab0d813429339c0f3de1f345550b5b9228b480c58ab7daa2a7b39ce1
 EBUILD pypy-2.0.2-r1.ebuild 4238 SHA256 5daf6f2699b734e0f4812de31472ee0f8beef335a892f233e2a5243327305214 SHA512 83e093cfc1e66f7e63d660d17d4c9e669f80fdb33eaa708b34e6a3c5008cc9e65d5107e41abc8557645eaecf9139cba596e87a7738042efdcf60306b3140509d WHIRLPOOL d35333732552971bf29cacfba6c73b45616f43dd20626384beba8488bf3b9092e9a8cec0b02ea2e62ef9a3a0ccb2f5599e068ddb239f3221ce61a2f17c045f73
 EBUILD pypy-2.2.1.ebuild 4607 SHA256 8c2b5bf6168831e5231a5af1fab6faeb9615c5675039d387a662db8d4afc711e SHA512 dd0a8594d4cd294a2100b02be56f99f2db86f573e75f5c34eb4db6fd40b2925806ec34586ff656226a20577322944b8d0b166677692b49fa8828bac24992e865 WHIRLPOOL 92646486accd408db4a4e671c390c806ebc4d7f256636f8c642e290ad5200d4e5b9d26a4620f2fe1cbecb4c2ff608abd0b37ce566619b192e218e3be0d0c5e77
-EBUILD pypy-2.3.1-r1.ebuild 4809 SHA256 d0c1b2dbe4cee01be721a6e1c53a581f3439806bf11a1d5286d0ebfef6f4ee27 SHA512 da33c9a42f7f6088b2336455e9c7e767711594178c7066d9b87d0ced5c13eefc6f66bd7ba09663cb0afa7100204839d01264ffbc578855d1f0bc53c2d825364f WHIRLPOOL 4e771d4c0a25888903e5b7bc8ed482e2c9668992f5dd5a32fcecb058ada5542bbe7131dfcc43906744b99f6159b0d07f98e22d69c428cfdce7b6e53eb3f24af8
-EBUILD pypy-2.4.0.ebuild 4851 SHA256 2f039b152ba1f3959bab9f472d685db668d4e0d8cc60f69942ef616490ff2503 SHA512 1608cbf1d0942afddeeef05110e919022e34c66b7952bf0436af1aa26f931def94048f15b4d7ecb04c373a29a0d93a7fc1a4226b44760ea41fc360c22f08cd0f WHIRLPOOL 5e47d06a51e3a70daaf5579d8790c173c47dd2a2876d25952a855e77f550bb83e2f3c5a8e73168ea703506d4a366af21e0ad6e927e154251e1d85dc1fd1f50e4
-MISC ChangeLog 13345 SHA256 19735e8f992a88df127bfc1524e81a87e006a044528b1223ed7430e2e77ff5e7 SHA512 0a0188965ede65a7a0cf0ada286b436c54ef2c49cb24dd6a3dd654035982f951a0d93172116e1d74f9b735d3407168f369565c6a5d8d895d23e1bdacdc7f0a44 WHIRLPOOL c8f0907f7eb30811d63b0fc60c20dae1c2a7633ec8e6eddee060931cef6e1492bc3d8460d79a02a066da2cfa603de0db34ff436aade2a0a7c49942df2ed46d09
+EBUILD pypy-2.3.1-r2.ebuild 5161 SHA256 c8f8b0e0704db9006d34c8a5b8b9c1e9239a5bf44a5208b370fc8da317922697 SHA512 a51f1afb96cf9aea2535a26b76beb564f1358a16d80046d49d662e788c76b84b461cfc7a427c2a72be35db47ad44ffd269c8df72184bc143ef2f06bfb507b63c WHIRLPOOL 30f5264b4fe89396ce0312bd6f8bdac977107bdd63dfdbe4a2c1ee5a4a628d72cc0e99c54efd7336a5dd408d3391ead20b0b702fbb4e290470aa7349321ffa52
+EBUILD pypy-2.4.0.ebuild 5202 SHA256 561d7b8dd78b42fde9e19c4d7b08eef54a58150fb0996eca9ddf2e71147de56f SHA512 1e26e4e543c22051058f1738cbedf29d956de158d689249cb56b67ee834a396e9f9038b8145777967d8609c3b0a92b38c6c0ad84b31ce7e795b362bf225fe103 WHIRLPOOL 6b460902d42da48bb2e7076aaf78e6c646aca470178dec68ddade36674ce227d11a7104455d14a860cb81d3166ee4a71ea126f4675c824e92016125f0de1c324
+MISC ChangeLog 13547 SHA256 2c9b95cdd881cb1b06fc7d8cc85393694de17c72a34cade2a6ad989cbe6b52d0 SHA512 fe94e23a100dbc67126197d5a6b16f600fc494ea513bb5510bd214f3d0d62d5e4ae260106af679a7f03a9d07ad88c8584413acbbdaea339f757bea322c010848 WHIRLPOOL b58bce0fe7f2bfda6025b82a40658ce40c56ab0dd209c5afc8397e07b5add6f59e89c051b291cc80eae4227fd4863cb3bb029a5fc602499d467d759679d66d5a
 MISC metadata.xml 490 SHA256 83fa771c99b84586c0ab24e534b52285b03dc33d3fcbed250b193517a45f7e1e SHA512 2493a473927dd1fa6326623e14090abccd988fb74d1de9a523d1cfc745ef1ed3d0c78d48b53c65fced305c38ba6463414940b2a04bfe0935248dcb92be863dda WHIRLPOOL 25ecd13efa803060bfaf9ae9afcfc91d5ab65c70b5c67a77c14a81a73215a4adbad51568ac070f87432b6e3f45d2fccab2fdbebbb4fdac631cc8bfd27d4a6649
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUWOsSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOaBUP/AwAkmNHsd3rClF8wttsgjNI
+RTpUdkRStEWqPNSvU+XiLOOTG9tmhIUc7OZkjizm9Y5JVQm9kAkrpR0qwUIKGmVz
+me64p10JFELm8UUrLYYsY8Myv8EzIj2eTToBg/XcHMcirfUvbwU610MxPiiMMUGn
+U2MA1fx8tUOPI0DgDAG1WSjBITHNqzwMiW5KW9tILO94XYdDO4QocBtX5/TV7oIV
+m5XhgVuD/97qPA16k6UtWGxvUYqRdO/VDLzGTlrcrRz0wsa44CMXCow4X+lULbqB
+eTnF6aJC+mUnlibLsNylg21Pbvliy6VyY170N+ed0mnXJT8wGM/yfN3wfsiQAMoT
+VaZUnzHNEFyF4MrNVC28oK1O/jZw1t3mfXFhmQ7jkVz+4Hm3W/PnvDg9ALPSw4cU
+EIplx4URJARwfXXIuSmOYZ/0bqEgWEv5FKAUWSui6uKXycf009l7Pb8rXtv7oRig
+CQjkf4ueAU5KjzxOOXbNRC+MfmQ/OfIFavsTCXNZbz0E7RC63GV1cyXStKZ4DExj
+32iQKnCE6fwSKEqfxydUrzxdVLAJVuryY+Zz3qYKOJubBs02MzNaef7vURCZLsxP
+yJffxkb5LSRt+IOSAX/IoNQHITWcmg1KZJ72o/M7Foep3iBsDETGAo8hLmpEJE3k
+Yy3EjMM9DqYVUKyQOESG
+=cuC0
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/pypy-2.3.1-r1.ebuild b/dev-python/pypy/pypy-2.3.1-r2.ebuild
index c2a10845a601..785a44412d7e 100644
--- a/dev-python/pypy/pypy-2.3.1-r1.ebuild
+++ b/dev-python/pypy/pypy-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/pypy-2.3.1-r1.ebuild,v 1.1 2014/07/15 00:34:44 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.3.1-r2.ebuild,v 1.1 2014/11/04 15:04:44 mgorny Exp $
 
 EAPI=5
 
@@ -15,19 +15,20 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/release-${PV}.tar.bz2 -> ${P}-src
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc +jit ncurses sandbox shadowstack sqlite sse2 tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	dev-libs/expat
-	dev-libs/openssl
-	bzip2? ( app-arch/bzip2 )
-	ncurses? ( sys-libs/ncurses )
-	sqlite? ( dev-db/sqlite:3 )
+IUSE="bzip2 doc gdbm +jit ncurses sandbox shadowstack sqlite sse2 tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	dev-libs/openssl:0=
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:5= )
+	sqlite? ( dev-db/sqlite:3= )
 	tk? (
-		dev-lang/tk:0
-		dev-tcltk/tix
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
 	)
 	!dev-python/pypy-bin:0"
 DEPEND="${RDEPEND}
@@ -51,7 +52,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/1.9-scripts-location.patch" \
 		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
-		"${FILESDIR}"/${PV}-shared-lib.patch	# 517002
+		"${FILESDIR}"/2.3.1-shared-lib.patch	# 517002
 
 	pushd lib-python/2.7 > /dev/null || die
 	epatch "${FILESDIR}/2.3-21_all_distutils_c++.patch"
@@ -135,6 +136,10 @@ src_install() {
 	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
 	dodoc README.rst
 
+	if ! use gdbm; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
 	if ! use sqlite; then
 		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
 			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
@@ -163,8 +168,12 @@ src_install() {
 		|| die "Generation of Grammar and PatternGrammar pickles failed"
 
 	# Generate cffi cache
+	# Please keep in sync with pypy/tool/release/package.py!
 	"${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)"
+	fi
 	if use sqlite; then
 		"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
 	fi
diff --git a/dev-python/pypy/pypy-2.4.0.ebuild b/dev-python/pypy/pypy-2.4.0.ebuild
index 8ee9e448f4ca..4574b3a32606 100644
--- a/dev-python/pypy/pypy-2.4.0.ebuild
+++ b/dev-python/pypy/pypy-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/pypy-2.4.0.ebuild,v 1.1 2014/10/20 02:15:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild,v 1.2 2014/11/04 15:04:44 mgorny Exp $
 
 EAPI=5
 
@@ -19,19 +19,20 @@ SLOT="0/$(get_version_component_range 1-2 ${PV})"
 #KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 KEYWORDS=""
 
-IUSE="bzip2 doc +jit ncurses sandbox shadowstack sqlite sse2 tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-	virtual/libffi
-	virtual/libintl
-	dev-libs/expat
-	dev-libs/openssl
-	bzip2? ( app-arch/bzip2 )
-	ncurses? ( sys-libs/ncurses )
-	sqlite? ( dev-db/sqlite:3 )
+IUSE="bzip2 doc gdbm +jit ncurses sandbox shadowstack sqlite sse2 tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	dev-libs/openssl:0=
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:5= )
+	sqlite? ( dev-db/sqlite:3= )
 	tk? (
-		dev-lang/tk:0
-		dev-tcltk/tix
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
 	)
 	!dev-python/pypy-bin:0"
 DEPEND="${RDEPEND}
@@ -139,6 +140,10 @@ src_install() {
 	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
 	dodoc README.rst
 
+	if ! use gdbm; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
 	if ! use sqlite; then
 		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
 			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
@@ -167,8 +172,12 @@ src_install() {
 		|| die "Generation of Grammar and PatternGrammar pickles failed"
 
 	# Generate cffi cache
+# Please keep in sync with pypy/tool/release/package.py!
 	"${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)"
+	fi
 	if use sqlite; then
 		"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
 	fi