Backport the :0 slot switch to pypy-2.0.2 since we have binpackages for this version.

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

3 files changed, 187 insertions, 16 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 81589be49f50..a2097495f95c 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.57 2014/03/18 10:39:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.58 2014/03/30 20:55:45 mgorny Exp $
+
+*pypy-2.0.2-r1 (30 Mar 2014)
+
+  30 Mar 2014; Michał Górny <mgorny@gentoo.org> +pypy-2.0.2-r1.ebuild:
+  Backport the :0 slot switch to pypy-2.0.2 since we have binpackages for this
+  version.
 
   18 Mar 2014; Michał Górny <mgorny@gentoo.org> -pypy-9999.ebuild:
   Remove the live ebuild since it is outdated and not supported.
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index a393fb5ebb0b..6007d778c593 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -7,26 +7,27 @@ AUX 2.0.2-distutils-fix_handling_of_executables_and_flags.patch 15206 SHA256 0e0
 AUX 2.1-distutils-fix_handling_of_executables_and_flags.patch 15045 SHA256 7f93949bc00a225694e9f106eade2057f12c4d0f34341e47a98ef7a4323884ed SHA512 b76a980b0bd3db8b01d12f8f16d147b446bef08bd98e8874ea4fb5304e28f443a69763a442e3ccffd130600d3b0f4e895aff0a2b875059597bb74e1b3aed3889 WHIRLPOOL 8d093a952696b4e6fbbc15f10aa6890db2928bc3de8f65dadc6812a334289233a1e4c8202e1dea13238dee2a5722e7e0c9f2e7557aff88f0204a890058f79afa
 DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
 DIST pypy-2.2.1-src.tar.bz2 14439822 SHA256 252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f SHA512 68b52c5b1a9b96593aa1dd38ad0b1b7b282852008e3ae3c488a5e19ab2bede68e2b40afdb79d85a4ab21cb1da6647b8b958fcefe34c99a1f6cbc1a19d695d3b6 WHIRLPOOL 6eca63959d8ee5663f868daaaac32ad1180b07e2f8b63d839652902095a098ffbfa29c6f83451733270a4b2f73b65450cb3b80a878b9dd1ec71089bfff11e9f6
+EBUILD pypy-2.0.2-r1.ebuild 4202 SHA256 9c7e66a49cb0d55a2ffafefc9693a3b6d440ba4b5ca9f3830a3dcd9a3038c4ba SHA512 91cb225247d7eb4c80baf776262df1a99b041c0fca1441da4d947a0a1f2e2075baf9c08d624f84b2fd51ae75fc44ba8162df33689fdf15ba7099d8e279748910 WHIRLPOOL 041c7585a2d25f9824ae501a8fa2f618750dbd8a28094c32f65ac8379c4ac6ea34fcd4c261413d369c776f3541a2ab99c37f7347895022b377d8629ccf732a19
 EBUILD pypy-2.0.2.ebuild 4235 SHA256 45653cf74e91c1592502d58648c32dc554394c4f5aa269bf8513f33d38df0b76 SHA512 d9d12b365788b5c1283a8ed033bcb705a06785dd10afdaa4c48d72f995e6c88e4a0ac0bb5e3833a618e6678f26b7fa07a44962c4182ca8c458d35d1d39d804d6 WHIRLPOOL 369a0d886af0200215615d839f7034ab172218562124db20cf5295c4f2b18a4fd8b2ab2c1627c42a970cb89df8ff1797c8d851636c20c6843a83ec59afd87b5c
 EBUILD pypy-2.2.1.ebuild 4070 SHA256 5079b87d02cca2ae7c3e4685612487f34baf60ce039f258fea60a6b2974c323a SHA512 7f627fc97cfc39d1d533daa13ef9d8d66814b922b299f8ab864f40ce2b6d7f05d9e0678cff4f1353ef3001ba536428e8aef6a524c9fa3772be55e9340ab9e397 WHIRLPOOL 334a9d186240b8c131aacb674dbc5eba69a17fc4848044999eefbee8b51f84a19b50333a35e3c1d53b74410e992cb1449490e486fedfd864ff39280a920c8ea6
-MISC ChangeLog 10913 SHA256 0dae452066637ab489916af43ff9af674f2aabe7426b9a8aaf87b90e4b9c687b SHA512 2b8b21ca7784fb8d87a0b0ac57b038e6182cd4ffae81455925f8706921c2eef1e69ebebf0961bf83625da82f46c2f60a391290794143b1a4602af6e979d62787 WHIRLPOOL ee9d06a21f082b86970e8a1e9ec6f081c11b5f2a0fd07476229859127a7df351a664a45063a582270a9ad40acd1feca9f2dbe38f74672f2c3aea6b7c12b9f021
+MISC ChangeLog 11107 SHA256 12af185eace51a36390ca218831de726dc090fd304e06048f497a0f01c7bec9d SHA512 56be09397d62f3431c433b09c99dacce01e549ae4683fb4e21ad647fbb4dc3962ee8684db5bcec31628280748e7da1c0166928f9015e3e7dda3ea11eea295c6a WHIRLPOOL a9fe15243a0a3d19d0befddedf416f0778d052bd9f08ebec5b4c25779f0d3f33c00a2d58d2d3f6c7b35c0f3c9b9896a7ce2f0797ed67616d66807ce0d2a4cfaa
 MISC metadata.xml 490 SHA256 83fa771c99b84586c0ab24e534b52285b03dc33d3fcbed250b193517a45f7e1e SHA512 2493a473927dd1fa6326623e14090abccd988fb74d1de9a523d1cfc745ef1ed3d0c78d48b53c65fced305c38ba6463414940b2a04bfe0935248dcb92be863dda WHIRLPOOL 25ecd13efa803060bfaf9ae9afcfc91d5ab65c70b5c67a77c14a81a73215a4adbad51568ac070f87432b6e3f45d2fccab2fdbebbb4fdac631cc8bfd27d4a6649
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTKCJnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTOITTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOpjQP/RE8Paj7zMT7TURPicEWQIY7
-8f2j+8eJfKsvYowC2DcpPq8F3wmnks9HaluKuORvER2MgpeKD3zQudoLJnaG5GLw
-cVKzLuTtsbjLopTiddexNi0YeL5mOoXbMOFBbgL5enqofMmTfyM/7eKyaM1KINdu
-+IE71MXs+9IFFp9UrVgXtDXQNqs7MgHXOf7DbMmn4NQfBFNiIJglx6RCCeatulVL
-Tc13KyGuauZx4v8kyx6Tw5pfXSltF/w5Uvc9BMfFLbkmVbcNppqKfHc2di60g22l
-wBF4ZUTl+eEbARHtFN9hHQn0hil4Y9Ditya/bQilx9HzIWGzY205WDBCoihiEaV2
-aYT7tqzvm2emGXzh+c+z+0CH2/0irZJgQMcxrUObfbA6nV0ivRxQi1l0aBDYvbey
-9sOris6ckv1/YdooJjbHZ5P2P6TQqKAEHHj3F6pV724fraqzipVJ1N5hLeyVfveO
-jIssB+Yx3Rsld0VXAsuYp6f8gmf9ZBTljbBIvuxNed66Abtv5YtvtN987QcjMrfp
-+noml+BWLexe+PmWKi0jk0AOHN2ZkZ8Pahv4pqzTo3XwDVHGzcNPAa6MyOX1y5DD
-FdATH/UgsJgYNsRbita+oxAOTYR5AjveHvjSJOuhvQpYl+hjEGPEpghHdS0WwYtR
-ZGArUQ9nRgc1YUulTO4J
-=Funi
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOTqgQANojfA0IbHflzcQQaZEKkbZr
+4RsjOJC8NU5wE7mC8ceoClUGpo4mNtoHqMtYqUxGizHNCZDLWm+hQgNG+q96E4Gr
+FhTsIpduiEaOEBH7EOlUrvqn+gzsB4nb+Yj4rDEL/vZuXAhg23qGGvb0IqJ8d9H3
+MqBioHrbG56+ixHlWiYOwrKRr5lOIFRTLQXzb/QG7MuSmJEDFA+9MdeiJxSMzK8B
+1X45X/6sF32Re7iGnRpq/3z3FZtSZ5kee8rUxReNgfmS5AVqDxaTiHPJsVxtUilL
+tx4+71u2EyAG05B80NBy5B/yQMAYg7puBS51lA+G2FP3Ry6T+9Pn7PT6Xuq6f8Gy
+02ePxlaz5LZ9/vIf1nmqwWEmQB0ENXuq2bokTUX+O5Ul/q88sP9vvatS0aJ34/Za
+QXYIv/EaY2OcJCg7sqMgL7blIDADz07ePLrCS4SDYbfe2pgtYWd/1jMYPTO8nNwz
+T5d7k2GuYPqiqye8Wf3dbiLTDTn64XdhJGZDR7Kh7iPOgWJA1O7HjUW9TXeZcn35
+m9K/lvntZEo3ngcAEUtpy1zyGqBTXUY7IWp55tuvFcb/SYsRuIt4lJVm5OJkYU5D
+mct2kjerVAUT9BjkF1aK9Z5IGYZlwKjQhUGr8mRp143SaN0cQP3OqE1a+MHD071f
+OrNYIZbVhVFsbDI4iS2I
+=atal
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/pypy-2.0.2-r1.ebuild b/dev-python/pypy/pypy-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..8e90fee6201b
--- /dev/null
+++ b/dev-python/pypy/pypy-2.0.2-r1.ebuild
@@ -0,0 +1,164 @@
+# 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.0.2-r1.ebuild,v 1.1 2014/03/30 20:55:45 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy2_0 )
+inherit check-reqs eutils multilib multiprocessing pax-utils \
+	python-any-r1 toolchain-funcs versionator
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="mirror://bitbucket/pypy/pypy/downloads/${P}-src.tar.bz2"
+
+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"
+
+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 )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	${PYTHON_DEPS}"
+PDEPEND="app-admin/python-updater"
+
+S="${WORKDIR}/${P}-src"
+
+pkg_pretend() {
+	CHECKREQS_MEMORY="2G"
+	use amd64 && CHECKREQS_MEMORY="4G"
+	check-reqs_pkg_pretend
+#	if [[ ${MERGE_TYPE} != binary && "$(gcc-version)" == "4.8" ]]; then
+#		die "PyPy does not build correctly with GCC 4.8"
+#	fi
+}
+
+pkg_setup() {
+	pkg_pretend
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/1.9-scripts-location.patch"
+	epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	epatch "${FILESDIR}/2.0.2-distutils-fix_handling_of_executables_and_flags.patch"
+
+	epatch_user
+}
+
+src_compile() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+		--make-jobs=$(makeopts_jobs)
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	set -- "${PYTHON}" rpython/bin/rpython --batch "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "compile error"
+
+	use doc && emake -C pypy/doc/ html
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	insinto "/usr/$(get_libdir)/pypy"
+	doins -r include lib_pypy lib-python pypy-c
+	fperms a+x ${INSDESTTREE}/pypy-c
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use sqlite; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 || die
+		rm "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py || die
+	fi
+
+	# Install docs
+	use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
+	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+
+	# Note: call portage helpers before this line.
+	# PYTHONPATH confuses them and will result in random failures.
+
+	local -x PYTHONPATH="${ED%/}${INSDESTTREE}/lib_pypy:${ED%/}${INSDESTTREE}/lib-python/2.7"
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi cache
+	"${PYTHON}" -c "import _curses" || die "Failed to import _curses"
+	if use sqlite; then
+		"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3"
+	fi
+
+	# compile the installed modules
+	python_optimize "${ED%/}${INSDESTTREE}"
+}