Add sqlite USE flag, patch by Arfrever. Make several variables local.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 25 insertions, 15 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 3b4fb83e8b59..4dff6c3cd473 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pypy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.9 2012/02/01 20:46:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.10 2012/02/02 22:04:21 floppym Exp $
+
+  02 Feb 2012; Mike Gilbert <floppym@gentoo.org> pypy-1.7-r2.ebuild:
+  Add sqlite USE flag, patch by Arfrever. Make several variables local.
 
 *pypy-1.7-r2 (01 Feb 2012)
 
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index e2f6505f7535..5d8366f1b7f0 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -6,14 +6,14 @@ AUX 1.7-scripts-location.patch 412 RMD160 811c3cc38370f97274f8ec5cc36f34b3e79dae
 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
 DIST release-1.7.tar.bz2 14842336 RMD160 f94199989fc7eab30d256b341367e82049b84745 SHA1 db16d92db6b76960b76328f821c8c50a6d66864e SHA256 2e0884f4696cc8617be73cb8af8da063073d685b3d3e5de3366bfae4d33fac16
-EBUILD pypy-1.7-r2.ebuild 2358 RMD160 c89166ae9d90538c39aa6e29349952d68a64b97b SHA1 691271bc9bbadcaa9db9d9bfbfe1516cbefceb5a SHA256 9a6d04ba8d384988886c6ee300440d8a2d2fbcf1038a9a9464a2a4dd5c695eb8
+EBUILD pypy-1.7-r2.ebuild 2609 RMD160 b02d7155f623e97dc8c953da3d0b8cd5ea582795 SHA1 a4fad0ed042722dae1a391242e16931b5c78c543 SHA256 52adcdede5a89f65d7d59497d98c30046b83bcb179df8406363b8e738f53bd6d
 EBUILD pypy-1.7.ebuild 2178 RMD160 b2ae7f1c722ba462ec87535773cd15875a1f252d SHA1 37fbf7727e2577232c8a3b94740a1fa4311c39b8 SHA256 0ebe9c1caa8108c126a5d59c4277d5944fb993326b0b1832e99df7fee0d85925
-MISC ChangeLog 1806 RMD160 105f5c3e50b42c91694a05ef5659522dbaa956d3 SHA1 2548f7e36a51801f62585e869b32d809078fb0bd SHA256 c9298c514356ef2138a6bc0a401f6a8b2c513f7c5b98657c2fb0173f3ba0337c
+MISC ChangeLog 1949 RMD160 5783169a5a32231cc7fa036171a9fdf9bf39e7a5 SHA1 35bfe4cc5405b6968c9bfe46216e9f870f78c624 SHA256 26cfab1bd426cba2c35632455a2181c505d096b50f6f4b9bb01d6c057823bc2e
 MISC metadata.xml 358 RMD160 13e1ff90bd402683aa61bc852c2315c8a78200d6 SHA1 c05b8593fab223c77f5f5586cd4ac42e7fa7d406 SHA256 de0c75980912e01789a9d11203aaefadf08ee89cf3c7b6cc5169f01c1a24e77b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8ppKEACgkQC77qH+pIQ6RjaQEApOLfo3hcHAtXDkSyEmoNInDI
-WXDNzoSXljyBoamtpysBAJl0wc4TA3akTLymi8DvedVlFp/8k2lC1NftMFfsEEnY
-=tMdp
+iF4EAREIAAYFAk8rCGsACgkQC77qH+pIQ6RHQwD9GfxvPeSIMyG13xN09iPMArbL
+ZnonOLac3uhPT8CoNj8BAJIHCqxaWsg3tUTNn/hit3kp4F0hH0QMUNyKsq+vJ0cz
+=wkg4
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/pypy-1.7-r2.ebuild b/dev-python/pypy/pypy-1.7-r2.ebuild
index 3470d7ba2175..703851048cf6 100644
--- a/dev-python/pypy/pypy-1.7-r2.ebuild
+++ b/dev-python/pypy/pypy-1.7-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.7-r2.ebuild,v 1.1 2012/02/01 20:46:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7-r2.ebuild,v 1.2 2012/02/02 22:04:21 floppym Exp $
 
 EAPI="4"
 
@@ -15,15 +15,16 @@ LICENSE="MIT"
 SLOT="${SLOTVER}"
 PYTHON_ABI="2.7-pypy-${SLOTVER}"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples +jit sandbox test bzip2 ncurses xml ssl"
+IUSE="bzip2 doc examples +jit ncurses sandbox sqlite ssl xml"
 
 RDEPEND=">=sys-libs/zlib-1.1.3
 		virtual/libffi
 		virtual/libintl
 		bzip2? ( app-arch/bzip2 )
 		ncurses? ( sys-libs/ncurses )
-		xml? ( dev-libs/expat )
-		ssl? ( dev-libs/openssl )"
+		sqlite? ( dev-db/sqlite:3 )
+		ssl? ( dev-libs/openssl )
+		xml? ( dev-libs/expat )"
 DEPEND="${RDEPEND}"
 PDEPEND="app-admin/python-updater"
 
@@ -45,7 +46,7 @@ src_prepare() {
 }
 
 src_compile() {
-
+	local conf
 	if use jit; then
 		conf="-Ojit"
 	else
@@ -57,8 +58,8 @@ src_compile() {
 
 	conf+=" ./pypy/translator/goal/targetpypystandalone.py"
 	# Avoid linking against libraries disabled by use flags
-	optional_use=("bzip2" "ncurses" "xml" "ssl")
-	optional_mod=("bz2" "_minimal_curses" "pyexpat" "_ssl")
+	local optional_use=("bzip2" "ncurses" "xml" "ssl")
+	local optional_mod=("bz2" "_minimal_curses" "pyexpat" "_ssl")
 	for ((i = 0; i < ${#optional_use[*]}; i++)); do
 		if use ${optional_use[$i]};	then
 			conf+=" --withmod-${optional_mod[$i]}"
@@ -67,17 +68,23 @@ src_compile() {
 		fi
 	done
 
-	translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py $conf"
+	local translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py $conf"
 	echo ${_BOLD}"${translate_cmd}"${_NORMAL}
 	${translate_cmd} || die "compile error"
 }
 
 src_install() {
-	INSPATH="/usr/$(get_libdir)/pypy${SLOT}"
+	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}
+
+	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
 }
 
 src_test() {