Version bump pypy to 1.7 (bugs fixed: 379791, 383063, 373487).

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

5 files changed, 149 insertions, 6 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 5f64b3260b15..01249b96fe30 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pypy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.2 2011/06/24 09:18:38 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.3 2011/11/30 08:49:18 djc Exp $
+
+*pypy-1.7 (30 Nov 2011)
+
+  30 Nov 2011; Dirkjan Ochtman <djc@gentoo.org> +files/1.7-patches.patch,
+  +files/1.7-scripts-location.patch, +pypy-1.7.ebuild:
+  Version bump to 1.7 (bugs fixed: 379791, 383063, 373487).
 
   24 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> pypy-1.5.ebuild:
   Fix bug 372641, bug 372639, bug 372517.
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index dd665032415b..5767ca470185 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 1.5-patches.patch 2054 RMD160 5c2374be42afe88706e465246a15ea608ad969f4 SHA1 2a4cd500dbdf3bb3d55cee52abf27ca0b4f4ed72 SHA256 e2b499a68e9c27869462dd902629e3e1da682dca5cc8b3a5f1888f28e27158da
+AUX 1.7-patches.patch 1842 RMD160 ee42ff2383477353cf0230a8567b22d87a4b4d56 SHA1 4fa9f1ac91b3b5466e21d8d58dbc9f09b1fd90dd SHA256 1417373a73221b65dcccdee1539a7a11018384ea3f7908cacc2e07b525ebe291
+AUX 1.7-scripts-location.patch 412 RMD160 811c3cc38370f97274f8ec5cc36f34b3e79dae56 SHA1 c03fa9679443ed9461829745f5bb00cfecd3eb22 SHA256 abc39fbbf69d1d6b478a4a16626950e8e0b607fb05c6e1e1c10618c59fccdda9
 DIST pypy-1.5-src.tar.bz2 14181501 RMD160 9c7d479ac5cd51c3789f3db99674b4c2936d88e0 SHA1 0ebcecaa4c725bf1a48272033d9f429b8a82b7e1 SHA256 1e827769d2384e38c358da0d2a7e87e843c819675c844dec503c475255490ad0
+DIST release-1.7.tar.bz2 14842336 RMD160 f94199989fc7eab30d256b341367e82049b84745 SHA1 db16d92db6b76960b76328f821c8c50a6d66864e SHA256 2e0884f4696cc8617be73cb8af8da063073d685b3d3e5de3366bfae4d33fac16
 EBUILD pypy-1.5.ebuild 2131 RMD160 6f287ec56a2099061fc8ce7955b4923829efe5b7 SHA1 031e3fdc4e9614568cbf86613624cdd8505927b0 SHA256 57df0b0ca57ec9dc69284b5bdfaee77786e0fc2c1bfe204a0835968a9f246111
-MISC ChangeLog 483 RMD160 7fa2c92c37aec83d4ff5f9c7b0a191bab62a0046 SHA1 836f1886c9241b2d32d73ba7b0222c3926389e86 SHA256 9d3e1d611e7fa557166a766c539fefb2e4ec6cf678d40b453cc7c5c8d8bde070
+EBUILD pypy-1.7.ebuild 2263 RMD160 a508d311d32092e74297c1ac5bd92694c4047694 SHA1 5a1222e7317fba9eb4d6e34f1ced003efc8ea303 SHA256 292ce9f325b9eae96922f8eb6be8aba7e10122f7163c7e1ade4688ef3f189b4d
+MISC ChangeLog 698 RMD160 a966f797353f41234b38b986fd9e4fd3d4c83c08 SHA1 103ebbf94f25f9ce4e608ea7370a9f5f7c8d1590 SHA256 d49aacc80f572979b6638254877e79bf78775fa8eedc4d26103d0dc40e3aad23
 MISC metadata.xml 344 RMD160 4bd17fc59db518f8bc618d4dea646125bac847e8 SHA1 e4e25b65789bae8aaeb01ee897ca594d935287d6 SHA256 ba7629d47b3bf832a55ad33e58d361492b2f366a5d3a948f981862bdd1d54d73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4EVncACgkQxeMuLWsGW/sazQCcDCBM26H8GO7N9fXumYx/g/H0
-gbAAnR7Ax2uZzR64CBrtDa1V49oVDL0J
-=G4xz
+iEYEAREKAAYFAk7V7jEACgkQxeMuLWsGW/uRaQCfaEMDPkiokK7hs1blXW0/hAwG
+zKgAoKEzjQ6DuJEdhh7FzUDu4Opfi/V+
+=jkjN
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/files/1.7-patches.patch b/dev-python/pypy/files/1.7-patches.patch
new file mode 100644
index 000000000000..a03ca2240c88
--- /dev/null
+++ b/dev-python/pypy/files/1.7-patches.patch
@@ -0,0 +1,40 @@
+--- pypy-pypy-release-1.7/pypy/translator/goal/translate.py.bak	2011-11-29 14:23:55.000000000 +0100
++++ pypy-pypy-release-1.7/pypy/translator/goal/translate.py	2011-11-29 14:24:16.000000000 +0100
+@@ -255,8 +255,6 @@
+             log.event("batch mode, not calling interactive helpers")
+             return
+         
+-        log.event("start debugger...")
+-
+         if translateconfig.view:
+             try:
+                 t1 = drv.hint_translator
+@@ -266,8 +264,6 @@
+             page = graphpage.TranslatorPage(t1, translateconfig.huge)
+             page.display_background()
+ 
+-        pdb_plus_show.start(tb)
+-
+     try:
+         drv = driver.TranslationDriver.from_targetspec(targetspec_dic, config, args,
+                                                        empty_translator=t,
+--- pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py.bak	2011-11-29 14:22:29.000000000 +0100
++++ pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py	2011-11-29 14:22:55.000000000 +0100
+@@ -1694,6 +1694,7 @@
+             }
+             """
+         elif self.format in ('elf64', 'darwin64'):
++            print >> output, "\t.section .note.GNU-stack,\"\",%progbits"
+             print >> output, "\t.text"
+             print >> output, "\t.globl %s" % _globalname('pypy_asm_stackwalk')
+             _variant(elf64='.type pypy_asm_stackwalk, @function',
+--- pypy-pypy-release-1.7/pypy/rlib/ropenssl.py.bak	2011-11-29 14:19:10.000000000 +0100
++++ pypy-pypy-release-1.7/pypy/rlib/ropenssl.py	2011-11-29 14:19:42.000000000 +0100
+@@ -159,6 +159,7 @@
+              lltype.Void)
+ 
+ if HAVE_OPENSSL_RAND:
++    eci.includes = eci.includes + ('openssl/rand.h',)
+     ssl_external('RAND_add', [rffi.CCHARP, rffi.INT, rffi.DOUBLE], lltype.Void)
+     ssl_external('RAND_status', [], rffi.INT)
+     ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT)
diff --git a/dev-python/pypy/files/1.7-scripts-location.patch b/dev-python/pypy/files/1.7-scripts-location.patch
new file mode 100644
index 000000000000..91b5ced96247
--- /dev/null
+++ b/dev-python/pypy/files/1.7-scripts-location.patch
@@ -0,0 +1,11 @@
+--- pypy-pypy-release-1.7/lib-python/modified-2.7/distutils/command/install.py
++++ pypy-pypy-release-1.7/lib-python/modified-2.7/distutils/command/install.py
+@@ -87,7 +87,7 @@
+         'purelib': '$base/site-packages',
+         'platlib': '$base/site-packages',
+         'headers': '$base/include',
+-        'scripts': '$base/bin',
++        'scripts': '/usr/bin',
+         'data'   : '$base',
+         },
+     }
diff --git a/dev-python/pypy/pypy-1.7.ebuild b/dev-python/pypy/pypy-1.7.ebuild
new file mode 100644
index 000000000000..58ec49661cbe
--- /dev/null
+++ b/dev-python/pypy/pypy-1.7.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7.ebuild,v 1.1 2011/11/30 08:49:18 djc Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs check-reqs python versionator
+
+DESCRIPTION="PyPy is a fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV}.tar.bz2"
+SLOTVER=$(get_version_component_range 1-2 ${PV})
+
+LICENSE="MIT"
+SLOT="${SLOTVER}"
+PYTHON_ABI="2.7-pypy-${SLOTVER}"
+KEYWORDS="~amd64"
+IUSE="doc examples +jit sandbox stackless test bzip2 ncurses xml ssl"
+
+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 )"
+DEPEND="${RDEPEND}"
+PDEPEND="app-admin/python-updater"
+
+S="${WORKDIR}/${PN}-pypy-release-${PV}"
+DOC="README LICENSE"
+
+CHECKREQS_MEMORY="1250M"
+use amd64 && CHECKREQS_MEMORY="2500M"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-patches.patch"
+	epatch "${FILESDIR}/${PV}-scripts-location.patch"
+}
+
+src_compile() {
+
+	if use jit; then
+		conf="-Ojit"
+	else
+		conf="-O2"
+	fi
+	if use sandbox; then
+		conf+=" --sandbox"
+	fi
+	if use stackless; then
+		conf+=" --stackless"
+	fi
+
+	conf+=" ./pypy-pypy-release-${PV}/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")
+	for ((i = 0; i < ${#optional_use[*]}; i++)); do
+		if use ${optional_use[$i]};	then
+			conf+=" --withmod-${optional_mod[$i]}"
+		else
+			conf+=" --withoutmod-${optional_mod[$i]}"
+		fi
+	done
+
+	translate_cmd="$(PYTHON -2) ./pypy-pypy-release-${PV}/pypy/translator/goal/translate.py $conf"
+	echo ${_BOLD}"${translate_cmd}"${_NORMAL}
+	${translate_cmd} || die "compile error"
+}
+
+src_install() {
+	INSPATH="/usr/$(get_libdir)/pypy${SLOT}"
+	insinto ${INSPATH}
+	doins -r include lib_pypy lib-python pypy-c || die "failed"
+	fperms a+x ${INSPATH}/pypy-c || die "failed"
+	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
+}
+
+src_test() {
+	$(PYTHON -2) ./pypy/test_all.py --pypy=./pypy-c lib-python
+}