Fix gdbm support, bug #519696. Add subslots to cffi-deps to force rebuilding of modules.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 36 insertions, 11 deletions

diff --git a/dev-python/pypy-bin/ChangeLog b/dev-python/pypy-bin/ChangeLog
index 903cf5b5e5f9..34fd2a501ac5 100644
--- a/dev-python/pypy-bin/ChangeLog
+++ b/dev-python/pypy-bin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2014/10/20 08:32:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.23 2014/11/04 15:08:24 mgorny Exp $
+
+*pypy-bin-2.3.1-r1 (04 Nov 2014)
+
+  04 Nov 2014; Michał Górny <mgorny@gentoo.org> +pypy-bin-2.3.1-r1.ebuild,
+  -pypy-bin-2.3.1.ebuild, pypy-bin-2.4.0.ebuild:
+  Fix gdbm support, bug #519696. Add subslots to cffi-deps to force rebuilding
+  of modules.
 
 *pypy-bin-2.4.0 (20 Oct 2014)
 
diff --git a/dev-python/pypy-bin/pypy-bin-2.3.1.ebuild b/dev-python/pypy-bin/pypy-bin-2.3.1-r1.ebuild
index 673e6fc6659c..874a319b0859 100644
--- a/dev-python/pypy-bin/pypy-bin-2.3.1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.3.1-r1.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.ebuild,v 1.1 2014/07/12 21:27:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.3.1-r1.ebuild,v 1.1 2014/11/04 15:08:24 mgorny Exp $
 
 EAPI=5
 
@@ -56,7 +56,7 @@ REQUIRED_USE="!jit? ( !shadowstack )
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +jit shadowstack sqlite sse2 test tk"
+IUSE="doc gdbm +jit shadowstack sqlite sse2 test tk"
 
 # yep, world would be easier if people started filling subslots...
 RDEPEND="
@@ -67,10 +67,11 @@ RDEPEND="
 	sys-libs/glibc:2.2
 	sys-libs/ncurses:5
 	sys-libs/zlib:0
-	sqlite? ( dev-db/sqlite:3 )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
 	tk? (
-		dev-lang/tk:0
-		dev-tcltk/tix
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
 	)
 	!dev-python/pypy:0"
 DEPEND="app-arch/xz-utils
@@ -124,6 +125,10 @@ src_install() {
 	dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so
 	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 \
@@ -152,8 +157,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-bin/pypy-bin-2.4.0.ebuild b/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild
index 03bc0d3fe203..ca5837407152 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.1 2014/10/20 08:32:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.4.0.ebuild,v 1.2 2014/11/04 15:08:24 mgorny Exp $
 
 EAPI=5
 
@@ -61,7 +61,7 @@ SLOT="0/$(get_version_component_range 1-2 ${PV})"
 #KEYWORDS="~amd64"
 # Needs some more sanity checks before it gets unleashed on users
 KEYWORDS=""
-IUSE="doc +jit shadowstack sqlite sse2 test tk"
+IUSE="doc gdbm +jit shadowstack sqlite sse2 test tk"
 
 # yep, world would be easier if people started filling subslots...
 RDEPEND="
@@ -72,10 +72,11 @@ RDEPEND="
 	sys-libs/glibc:2.2
 	sys-libs/ncurses:5
 	sys-libs/zlib:0
-	sqlite? ( dev-db/sqlite:3 )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
 	tk? (
-		dev-lang/tk:0
-		dev-tcltk/tix
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
 	)
 	!dev-python/pypy:0"
 DEPEND="app-arch/xz-utils
@@ -130,6 +131,10 @@ src_install() {
 	dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so
 	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 \
@@ -158,8 +163,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