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

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

4 files changed, 185 insertions, 31 deletions

diff --git a/dev-python/pypy-bin/ChangeLog b/dev-python/pypy-bin/ChangeLog
index 44c8430c0875..b08dd3f1e462 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.8 2014/02/21 21:25:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/ChangeLog,v 1.9 2014/03/30 20:57:45 mgorny Exp $
+
+*pypy-bin-2.0.2-r1 (30 Mar 2014)
+
+  30 Mar 2014; Michał Górny <mgorny@gentoo.org> +pypy-bin-2.0.2-r1.ebuild,
+  pypy-bin-2.0.2.ebuild:
+  Backport the :0 slot switch to pypy-2.0.2 since we have binpackages for this
+  version. Update deps.
 
   21 Feb 2014; Michał Górny <mgorny@gentoo.org> pypy-bin-2.0.2.ebuild:
   Bump openssl dep since the old version was cleaned.
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 8848360fcd09..08d04e0ef0e6 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -12,25 +12,26 @@ DIST pypy-bin-2.0.2-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 7754056 SHA256
 DIST pypy-bin-2.0.2-x86+bzip2+jit+ncurses+sse2.tar.xz 9000040 SHA256 cc27253d53cca461e4d4aa8ca3943cae783d4d6389b99d3b7f9f88055d3cf6bf SHA512 90fa4762933a3cbed297a5eb8f1e95fbc70ba02286fc66beb012f27dde1cd06c8eeff0fa2d4a32586d84acbda2608530880d3cc14ea099e3debd239d3c154780 WHIRLPOOL e5a241d3b15aff2bda92f578c2aed7ccc9fbb68f45baaad75eb7229a30dcaabefd6d81cb883f4de7122459a91c521a8c1e6f332500a3f73fa546a42a2e60cfde
 DIST pypy-bin-2.0.2-x86+bzip2+ncurses+sse2.tar.xz 5132392 SHA256 8d434ca55cf969016e0c739b4671b97981f9af36b3937c4f4c1acba4d54df8fc SHA512 cb7ba91f1bb6b67f540e5b573bcc27ae92741407e44e204fb401a6ac38653ecdd2a3084b53216f3ed209279a3d01725d2b7d174e6f7d1038da80d448d40b00f1 WHIRLPOOL d171742333d7209ce2dcd50b0ab8bd2e6382c8bb9f0d7a5d69d2268217afdd155abf5c41a96f9bad18c2606b2f554b7a8ef2f1e943ae41412270582b476cd345
 DIST pypy-bin-2.0.2-x86+bzip2+ncurses.tar.xz 5137536 SHA256 c34e60673346b59022560608f633962dee47d79b96e4015677e86f507ad61248 SHA512 0d737a7d5018d6a4d70d3c0921ed4d8882bce4e6f9ff2b9742ab1763cc760a4ed22fcf683e4e7a1693f35897fa4d20500e6d5a31803e34b15175f4081a2ec6d8 WHIRLPOOL 04de2b1aa32f1a098d38b2b0512822c24385bed9db94f0cad03611a45e189812654f2f33ea6dad1a71a77bab878a8109ddf9c8873dc127a49352adac2a8ff7df
-EBUILD pypy-bin-2.0.2.ebuild 4397 SHA256 a6bdc2b607c4b4225dd5bcdfab57af57373cf5bb86d35cc028c2952fa898f88d SHA512 659aae1dfe8fcfb516b741ee9bce05f3e8cf5ded272a2024990af8dd7ef56b989410a5318897d9cdffc6ea48bdada972a196b4b6ac36aebfba1cf7ffae9ff766 WHIRLPOOL ecf5600016980feb44e214854c0d3b439a69b851e6f1e53f61bbaa1c240dfa4d96a349556bf304c72b9c5fcfe09ccaefc759111681183ab8d4af39ecb370be3f
-MISC ChangeLog 2434 SHA256 e684e814056cc5db470df93c5483a4b16a200bdeb4523eee105d2aa1d485c88f SHA512 e43bf1c352413cec2e282b45c6e5c52e9fea77f7d06faaae1fa43abd6fe02264ce3c06576307be386e791b66b23c20a485842996d71a00098a5d49fbdf708484 WHIRLPOOL 74fe9f397f5194b56b673cfeae44393900a6ed861b154bb55a732339c3633382138f27b4fab033463c070a69cc420eff56e495f724ef2cac701f98aff9f84722
+EBUILD pypy-bin-2.0.2-r1.ebuild 4185 SHA256 1d7b491006f65efc704164682789dcae619c1eabce36f2a61af854ea5fc107ba SHA512 b4bff7aa56eca0dd783f15d7b1cb5bc6615479e2efd255d7a451b4b379de218c3c53c94752edea46049daa651d7fff5d66bce3af2434a227158e9848cc98391c WHIRLPOOL b63e82f542ca69f59a9cefc2750b39ff77bfbd5255208efbb07fce29da0f9638724116814844da893473a7537404857adc572b8fa568101ce9f41611956ea0df
+EBUILD pypy-bin-2.0.2.ebuild 4303 SHA256 ad4da78d048d0767e2735b55cfc6558854e4d601a4c0b3d83fcb42f04270f068 SHA512 03b9f5db75ae8858bdeb2a75be8e43c3bef4468c7393cfa874b02e2a8ee833281df10bf8bd047180873d73c3aeee81a69bbbb03f9212c361d92ebd7567d394cf WHIRLPOOL 505019e3b618534927355fea627cb78d1d0386426171b13cc94190f76b19a0335c4162289ef1b2d22aca1ebd51295ecc3ad1bca591c4c9a77517aeb309545d48
+MISC ChangeLog 2674 SHA256 f5350386942ee398436eaaf6aec46aa8b92d18f3d7856de4542be63ea9cd83ce SHA512 256bd86f40b492868c623c8d5dfee0e3ae225727cf206118d257a63ca840053d6e2563f0deee97b0abd86332095337aa33eacae711f25d2c2cdf2da023c9b00b WHIRLPOOL 7968783b904ee40097092405c57ccd7edc3e685eb40733e163fb0b85303f373705abf1d04da15d31fbf73ec8194226c306b1590d3da40b37b3a0bb27443d59df
 MISC metadata.xml 249 SHA256 a2c50ffd8096682a92b858f54a0aa46ac29ff426f1ef11057fedf3054060e1f1 SHA512 2d38cb5eccf89da9c9e75e7c779395965d7b43aa4981743bdef00fd6f03bd853e4f309ed7f7add533c0104e2d9f93f135ca3b78d90c1ba10d2a251cc64a33278 WHIRLPOOL 9c8004d9523e09bbda0a71dfe7df416f891e08f35fd2d5b8218709a2a110303f15c9d5e37c5d0fd45df5e95b8032da315a40c7af5967ab4acf03f0d8ce3c170f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTB8RhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTOIVMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOlosP/1XJFI84AJAjcb0KnByY3VHW
-lS2hndewezlP8fq/WuuRNLWS26hCrztBpEQf0ZvF192xAB69AvG1qsjO65BxP9PO
-2hr94zNowiPg0t8n3awtdxBTrvjgGpV+2lcopqy8iWa/uW+DcgGltjbABMqoKkN5
-jjOYMHOffUAKgk74dO9c622cxyY0mKfXjH3nzrXtBF56o6PqItLk69m9ym699cm7
-EpJMNHTjr+8E1MVKe/7kr+4Xp6cE5m8lf4xNXht3khNQT6NKi5nYUBVlPM4uMIhx
-gi78JIMdqUl7s9NOgy8MW3iCrpOnt+pOVZoy4TBV2hkyXkjZBep3Uu0iD7MIkX+g
-SCNnX32gh4TPqwzdycsYwkiWC03qgg04w/s/TY/InVxIuEk2mAD+fyL0jdat945t
-gsxeLlArxDujq+F5GaHauGykoVyMrh2HM1p82c/ENRwklFjZ1511vBCNbTtatRUt
-+ncMmUvPLrnK8HKwcFM4Qkht1+Gy7Ktqrn4uF1W8n68v+UU74yWLCIFalq2RUvMS
-grsU6YP2ea80+W4ipbKsjqVKP3YQBXnpmPK7hWF7hFn2yoDS066s0J5oqdvou0+C
-WSY1oaRKsGs1rJcEr4BS4hgn4ihR/Pj0kItDNI/84UwYJcqVN/AocPlbFRM/4QuW
-Qs1IMoHEh7k13hGv/+vo
-=uRjC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOeIIQAIgmqmDS3vRjq2v8LRgXsvBk
+3uKGhLruKcaply2VOffzFyvrO5TiDl7HjVS+LhhO7TARSnttPK6jVSkre1yFv6re
+iFnfuvmwWSI5WRu3gtUJD1cNecCdjq5sOYmObCB7D4eBb60LXDU+tndLnTIO124v
+N+cT1MD1gaGlmEowxOlCQZofxgxavBmFju0zAXwbodrhMhIL6Uyr6jgTB6Ivg302
+J+FhFIYDXPHppXlWglYcXZIhf9wUqUVUEgyTto5tHMKP8paJY2vitR0RLkdi4Snc
+xUuj3kzx1nJCwE6sARi0krblxFEA48tbnO0Ph/OIMtGbIlJ0cOJiU9uGYNKNysG7
+g9mcdLVp10sx3I+jVrfDx96sEOHhwbYYepE+DAFudMe4oItv+/vcKjAHjY/oqgMJ
+rzxbAt/Dq3U2OD5EVVy+gM4TuXbuxeU/AyQFh/ob7C6Gs+EH8YAlaXjq9njm7da9
+n2DmHlss/0j6Z74gWKC6bqa+vRd3M6Ol09YABXZYrOerZ0tbPuGFrrN/5jJkPy34
+2jJCpa7s7uhUVaPnA3QUC9n5AYwnMNuAlX1gA82MrfQ8P+kheNjPs/pHdzZ0AwW8
+v8bGs1QLe6oGlxqiUpuPpFdDwGEBho2CO3LmmgEZkvtvQsUCf/Tb/Zw5iry/3lOp
+k52JYx/ScA+r9tILW5EF
+=V60f
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy-bin/pypy-bin-2.0.2-r1.ebuild b/dev-python/pypy-bin/pypy-bin-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..6e2ea13df55a
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-2.0.2-r1.ebuild
@@ -0,0 +1,149 @@
+# 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.0.2-r1.ebuild,v 1.1 2014/03/30 20:57:45 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy2_0 )
+inherit eutils multilib pax-utils python-any-r1 versionator
+
+BINHOST="http://dev.gentoo.org/~mgorny/dist/${PN}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="mirror://bitbucket/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
+	amd64? (
+		jit? ( shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
+		) )
+		jit? ( !shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
+		) )
+		!jit? ( !shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
+		) )
+	)
+	x86? (
+		sse2? (
+			jit? ( shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
+			) )
+			jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
+			) )
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
+			) )
+		)
+		!sse2? (
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
+			) )
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="!jit? ( !shadowstack )
+	x86? ( !sse2? ( !jit !shadowstack ) )"
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +jit shadowstack sqlite sse2 test"
+
+# yep, world would be easier if people started filling subslots...
+RDEPEND="
+	~app-arch/bzip2-1.0.6
+	~dev-libs/expat-2.1.0
+	( <dev-libs/libffi-3.0.14
+		>=dev-libs/libffi-3.0.11 )
+	( <dev-libs/openssl-1.0.1g
+		>=dev-libs/openssl-1.0.1c )
+	( <sys-libs/glibc-2.20
+		>=sys-libs/glibc-2.15 )
+	~sys-libs/ncurses-5.9
+	( <sys-libs/zlib-1.2.9
+		>=sys-libs/zlib-1.2.7 )
+	sqlite? ( dev-db/sqlite:3 )
+	!dev-python/pypy:${SLOT}"
+DEPEND="app-arch/xz-utils
+	doc? ( dev-python/sphinx )
+	test? ( ${RDEPEND} )"
+PDEPEND="app-admin/python-updater"
+
+S=${WORKDIR}/pypy-${PV}-src
+
+pkg_setup() {
+	use doc && 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() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/pypy-c . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	mv pypy/module/cpyext/include/*.h include/ || die
+
+	use doc && emake -C pypy/doc/ html
+	#needed even without jit :( also needed in both compile and install phases
+	pax-mark m 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
+	#needed even without jit :(
+	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}"
+}
diff --git a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
index 3fdbeddbee65..2d3a2a86f573 100644
--- a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.0.2.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.0.2.ebuild,v 1.7 2014/02/21 21:25:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild,v 1.8 2014/03/30 20:57:45 mgorny Exp $
 
 EAPI=5
 
@@ -55,22 +55,19 @@ IUSE="doc +jit shadowstack sqlite sse2 test"
 RDEPEND="
 	~app-arch/bzip2-1.0.6
 	~dev-libs/expat-2.1.0
-	|| ( ~dev-libs/libffi-3.0.13
-		~dev-libs/libffi-3.0.12
-		~dev-libs/libffi-3.0.11 )
-	|| ( ~dev-libs/openssl-1.0.1f
-		~dev-libs/openssl-1.0.1e
-		~dev-libs/openssl-1.0.1d
-		~dev-libs/openssl-1.0.1c )
-	|| ( ~sys-libs/glibc-2.17
-		~sys-libs/glibc-2.16.0
-		~sys-libs/glibc-2.15 )
+	( <dev-libs/libffi-3.0.14
+		>=dev-libs/libffi-3.0.11 )
+	( <dev-libs/openssl-1.0.1g
+		>=dev-libs/openssl-1.0.1c )
+	( <sys-libs/glibc-2.20
+		>=sys-libs/glibc-2.15 )
 	~sys-libs/ncurses-5.9
-	|| ( ~sys-libs/zlib-1.2.8
-		~sys-libs/zlib-1.2.7 )
+	( <sys-libs/zlib-1.2.9
+		>=sys-libs/zlib-1.2.7 )
 	sqlite? ( dev-db/sqlite:3 )
 	!dev-python/pypy:${SLOT}"
-DEPEND="doc? ( dev-python/sphinx )
+DEPEND="app-arch/xz-utils
+	doc? ( dev-python/sphinx )
 	test? ( ${RDEPEND} )"
 PDEPEND="app-admin/python-updater"