Introduce a cleaned up PyPy ebuilds using python-any-r1 & installing epython module.

Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

4 files changed, 262 insertions, 5 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 91ec638579fb..3d0a5ee1ee9d 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,14 @@
 # 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.25 2012/11/18 02:06:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.26 2012/12/01 10:42:15 mgorny Exp $
+
+*pypy-1.8-r2 (01 Dec 2012)
+*pypy-1.9-r2 (01 Dec 2012)
+
+  01 Dec 2012; Michał Górny <mgorny@gentoo.org> +pypy-1.8-r2.ebuild,
+  +pypy-1.9-r2.ebuild:
+  Introduce a cleaned up PyPy ebuilds using python-any-r1 & installing epython
+  module.
 
   18 Nov 2012; Mike Gilbert <floppym@gentoo.org> pypy-1.8-r1.ebuild,
   pypy-1.9-r1.ebuild, pypy-1.9.ebuild:
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index b2277a150596..825d520dafc8 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -23,14 +23,18 @@ AUX pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.pa
 DIST pypy-1.8.tar.bz2 14927806 SHA256 ac98ad6d884207f8325ff4c783104ebea57a3fcddfef32abcdf97fd4307b6287 SHA512 d4360c3ece1860ec37171be7135e62552faf957cf51c259cb98572c1c3de321edc99b378319187b766bd3729536efe721c1d1a94783794228b1c22567addc7a8 WHIRLPOOL c1ee6381db9424c1d56028264eeb15310a8b1bbda26217526ecde7d2b2e80989fd61178b31aa31a03c7d7dc2843cdecb5fe8b47d702d6e4d820a09ad817e27f0
 DIST pypy-1.9.tar.bz2 13466551 SHA256 9fd599acade49ef98017bbce4f179f19cf2680489ff15235d3bad5b20bde0d68 SHA512 1e02f1f1ac493be35272212f2be62db17a01a95c56ffbd8c00a043587e38131e779928fef1383c61575ecb48bf4dc407b62726d30d5b5728221a612fe67ec8c3 WHIRLPOOL 5b601f31f695623c2e5f6d48ae902e07c5cdccafe415ae89878e5cf71408b31fc44fb1c173a93e66d81188503651000de219533e69071495b87d80a8d217274f
 EBUILD pypy-1.8-r1.ebuild 3148 SHA256 2b37dc20190cb79f1f543aca24e1abd1137debf92d7e5984850549948b67f0bc SHA512 f44c99d70f896b78d621e8c69d18b0f244c5e231a22aa930adf774618d42d76f55c7060575e43770b3a6b601ade7b8e52cac236a851ffddde17eee5aa877bb0e WHIRLPOOL 31f751c7cb3012823951d312a4ad4586e5c4d98fd684a7634b2fb4fbee457e3e0c3a9895c86fee5b8a284dba35c711f2c9ea7799426ab61f4a009daafe403284
+EBUILD pypy-1.8-r2.ebuild 3306 SHA256 3297ac3fb5eb85a158b730481883048695bb4dcc43aa01145a9843ea0336252e SHA512 817f9e35a6b7759e388254c4f5a42a3c02edd0a91d60d8e06635cdd266ed8f8983de7c866c8c280c51572d70dff715e5efa1c909940a1463886baaa214f95050 WHIRLPOOL 43e2ce308c2cd5fb4f2f1c4c52e6fbef4baef0f9e58cba06e2e804f84330a8ac131a2c8431cb4a96fdafe9672154e582abcf421e922b059c5d83116f3fc75aed
 EBUILD pypy-1.9-r1.ebuild 3824 SHA256 28babbcc17d1b081558493c8b0bbf568b98367d301ef8afaf060a584eefa6919 SHA512 2ee0246a13e399c7842e445062883c57525ea24314c1cfb43d10e4bb67607560a015dc2ad2ed7a24994ff528a0ea782efbac142ada5ad0a9171ea490494a82dd WHIRLPOOL 4702569f02d402de5e45159df05a272e9e853442c114889c634f3f996770c1f4fe7e3c3d8e8d56765bb03a0ecfdaabfad045e50670bd6452825db06bfd303e9f
+EBUILD pypy-1.9-r2.ebuild 3980 SHA256 0a9b541d85eba948301d63ac1d7139977427bfeb48f97039808b9628063fa704 SHA512 158fd35f3193b27f1b22753268af1280a76131b50d0bd9ec0d2393741aa04c873dd5326433608fe5c3f484a2ab5c27cf175726d8c0548bda624d5e9c0e7f3f10 WHIRLPOOL 84464805ec3be1348aa861003430009ffc356c1111c99e984012b1bae9051de5edac55fa2bf76ddd8350eb7f1bb092cb990b9ba52a742075656e70fb94ba4ae2
 EBUILD pypy-1.9.ebuild 3075 SHA256 4c49bc7e33ea8eccc5552e30cd2dab691ed579a5686b71ec97bccfa9336cc798 SHA512 3758cb3f6b0f34e45318e31a5765dffe369f0b63dbed1471f46c2c0c1948359026c413c19c77a95da5e16ebf96034186fc02a6bcf15f62dea5a034f6ccf13468 WHIRLPOOL 544d46da00f3e17c607cd284ac0413ccd565428e1d7a0217d1f2fd1bbb927433a9147b57957b293976c9eb26507e0365fedb26b58af0ad6bfdf6c16b27dd691e
-MISC ChangeLog 4973 SHA256 0b35be322058d6be2f72fc06072a11f5c5df5c186de53280c7b3d31ee5cb08db SHA512 c8175edca2b930764f1c073aa2829b1f6896477693e247f3bb360dceae69d9707fe636867e669f60dadccacc5579ff292298fbac02676b11770f4a8d8cae736e WHIRLPOOL a7803d00a534a8f2a8fff27d449d889975a5ed9bae5b6e66aede7b4350b46242f3b7cca574da674b34613a359e2e210fe5b6d37ebe34ac33bd6849860580cafb
+MISC ChangeLog 5211 SHA256 f02d9f6b3dbc8fb89d4162729afe97d6d4b1f10a86d351937304e8e46298d15a SHA512 68cecf1daaeebe4dc78fd6a1e8571ea71770450f9c931dccb43e721d8b8eae805a2588ec868146806f90dfda53f2ddc32b6456fff1e7e9cf4057ab9eeb0218de WHIRLPOOL 2430eafa5ef933efeb8a0e26e20edbfc5ea62ac097dc0d9e217f7ab2cc3c17356fa0c427a9a9f19142e1ae44542efb6710323ebc2bf39e7c01bae55daaf9d13e
 MISC metadata.xml 317 SHA256 cc6a42b7408bb6e6cebac0475a3419ff0f0e97c1301d5bdef029b3c24e278155 SHA512 87f0c04a0a10af65c51f587c3937995dcd5ddffe02caab1939a5562ddfbadd6baf5c8793c5f74717887d5779aaad6b7249a2a12d7f0f840cca6d79cdffa2ad7a WHIRLPOOL f5a509de1f99f97266128d34b79654a848c72d6a58caa19491874abe7c37fab047d6684c15397ed6f37f8b6e2ef35c0bc3e2831dd7d37739bc36116cc1b49284
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCoQqYACgkQC77qH+pIQ6SEewEAjDSV5PlbOscxSTZ62Iyzc0y1
-ZUQCmEIpnSZLoTnOsioA+wXg/ZDq602wzJ6OzKQcBxqD6bp5J78fbPCgYF2Xwg8z
-=0yYB
+iJwEAQEIAAYFAlC53wgACgkQfXuS5UK5QB1ucwP/csEQL1SAzgOZiVCUkkJy4LUC
+8Uj28RSxH6++fJj7CW7H7DekNwHNwfAMiTOvSFYLIhqfvUza0X2rJDFffNXwl2ol
+7wELwqk6+4vQuk0U8tyP8E8f8rYJdWtlveOl+I684fEvALPWGmqkk2O9atN8Jzx7
+XfJPsk6qvuidfATSews=
+=I94X
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/pypy-1.8-r2.ebuild b/dev-python/pypy/pypy-1.8-r2.ebuild
new file mode 100644
index 000000000000..ca17e0dda343
--- /dev/null
+++ b/dev-python/pypy/pypy-1.8-r2.ebuild
@@ -0,0 +1,116 @@
+# 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.8-r2.ebuild,v 1.1 2012/12/01 10:42:15 mgorny Exp $
+
+EAPI=5
+
+# XXX: test other implementations
+PYTHON_COMPAT=( python2_7 pypy1_8 )
+inherit check-reqs eutils multilib python-any-r1 toolchain-funcs vcs-snapshot versionator
+
+DESCRIPTION="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 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT=$(get_version_component_range 1-2 ${PV})
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
+
+RDEPEND=">=sys-libs/zlib-1.1.3
+	virtual/libffi
+	virtual/libintl
+	dev-libs/expat
+	bzip2? ( app-arch/bzip2 )
+	ncurses? ( sys-libs/ncurses )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+PDEPEND="app-admin/python-updater"
+
+pkg_pretend() {
+	CHECKREQS_MEMORY="2G"
+	use amd64 && CHECKREQS_MEMORY="4G"
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	pkg_pretend
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-elf-metadata-26a8d3fc57a7.patch"
+	epatch "${FILESDIR}/${PV}-sext-instructions-02dc2f6160ee.patch"
+	epatch "${FILESDIR}/1.7-scripts-location.patch"
+	epatch "${FILESDIR}/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	epatch "${FILESDIR}/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch"
+}
+
+src_compile() {
+	local args=(
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		./pypy/translator/goal/targetpypystandalone.py
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+		ssl:_ssl
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	set -- "${PYTHON}" ./pypy/translator/goal/translate.py --batch "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "compile error"
+}
+
+src_install() {
+	local INSDESTTREE=/usr/$(get_libdir)/pypy${SLOT}
+	doins -r include lib_pypy lib-python pypy-c
+	fperms a+x ${INSDESTTREE}/pypy-c
+	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
+	dodoc README
+
+	if ! use sqlite; then
+		rm -fr "${ED}${INSDESTTREE}"/lib-python/{2.7,modified-2.7}/sqlite3
+		rm -f "${ED}${INSDESTTREE}"/lib_pypy/_sqlite3.py
+	fi
+
+	python_export pypy-c${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=${ED}${INSDESTTREE}/pypy-c
+	fi
+
+	# Generate Grammar and PatternGrammar pickles.
+	PYTHONPATH="${ED}${INSDESTTREE}/lib_pypy/__extensions__:${ED}${INSDESTTREE}/lib_pypy:${ED}${INSDESTTREE}/lib-python/modified-2.7:${ED}${INSDESTTREE}/lib-python/2.7" \
+		"${PYTHON}" \
+		-c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# compile the installed modules
+	python_optimize
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+}
+
+src_test() {
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python
+}
diff --git a/dev-python/pypy/pypy-1.9-r2.ebuild b/dev-python/pypy/pypy-1.9-r2.ebuild
new file mode 100644
index 000000000000..1d5994b300bd
--- /dev/null
+++ b/dev-python/pypy/pypy-1.9-r2.ebuild
@@ -0,0 +1,129 @@
+# 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.9-r2.ebuild,v 1.1 2012/12/01 10:42:15 mgorny Exp $
+
+EAPI=5
+
+# XXX: test other implementations
+PYTHON_COMPAT=( python2_7 pypy{1_8,1_9} )
+inherit check-reqs eutils multilib multiprocessing python-any-r1 toolchain-funcs vcs-snapshot versionator
+
+DESCRIPTION="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 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT=$(get_version_component_range 1-2 ${PV})
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
+
+RDEPEND=">=sys-libs/zlib-1.1.3
+	virtual/libffi
+	virtual/libintl
+	dev-libs/expat
+	bzip2? ( app-arch/bzip2 )
+	ncurses? ( sys-libs/ncurses )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+PDEPEND="app-admin/python-updater"
+
+pkg_pretend() {
+	CHECKREQS_MEMORY="2G"
+	use amd64 && CHECKREQS_MEMORY="4G"
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	pkg_pretend
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-no-bytecode-4151f9c406b6.patch"
+	epatch "${FILESDIR}/${PV}-scripts-location.patch"
+	epatch "${FILESDIR}/${PV}-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	epatch "${FILESDIR}/${PV}-distutils-fix_handling_of_executables_and_flags.patch"
+	epatch "${FILESDIR}/${PV}-ssl-threads-1-34b3b5aac082.patch"
+	epatch "${FILESDIR}/${PV}-ssl-threads-2-25cd11066d95.patch"
+	epatch "${FILESDIR}/${PV}-get_python_lib_standard_lib-04ea518e5b71.patch"
+	epatch "${FILESDIR}/${PV}-more-ignored-ops-a9a8faa76bca.patch"
+	epatch "${FILESDIR}/${PV}-more-ignored-ops-146ddf82a279.patch"
+	epatch "${FILESDIR}/${PV}-pybuffer-release-double-decref-4ec2a5b49386.patch"
+	epatch "${FILESDIR}/${PV}-signal-a33052b17f4e.patch"
+	epatch "${FILESDIR}/${PV}-getargs-freelist-c26dc70ee340.patch"
+	epatch "${FILESDIR}/${PV}-ssl-errors-25d3418150d2.patch"
+
+	# The following is Gentoo-specific.
+	epatch "${FILESDIR}/${PV}-no-static-hack.patch"
+}
+
+src_compile() {
+	local args=(
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		--make-jobs=$(makeopts_jobs)
+
+		./pypy/translator/goal/targetpypystandalone.py
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+		ssl:_ssl
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	set -- "${PYTHON}" ./pypy/translator/goal/translate.py --batch "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "compile error"
+}
+
+src_install() {
+	local INSDESTTREE=/usr/$(get_libdir)/pypy${SLOT}
+	doins -r include lib_pypy lib-python pypy-c
+	fperms a+x ${INSDESTTREE}/pypy-c
+	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
+	dodoc README
+
+	if ! use sqlite; then
+		rm -fr "${ED}${INSDESTTREE}"/lib-python/{2.7,modified-2.7}/sqlite3
+		rm -f "${ED}${INSDESTTREE}"/lib_pypy/_sqlite3.py
+	fi
+
+	python_export pypy-c${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local PYTHON=${ED}${INSDESTTREE}/pypy-c
+	fi
+
+	# Generate Grammar and PatternGrammar pickles.
+	PYTHONPATH="${ED}${INSDESTTREE}/lib_pypy/__extensions__:${ED}${INSDESTTREE}/lib_pypy:${ED}${INSDESTTREE}/lib-python/modified-2.7:${ED}${INSDESTTREE}/lib-python/2.7" \
+		"${PYTHON}" \
+		-c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# compile the installed modules
+	python_optimize
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+}
+
+src_test() {
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python
+}