public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/mgorny:master commit in: dev-python/pypy-bin/
@ 2013-07-21 11:27 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2013-07-21 11:27 UTC (permalink / raw
  To: gentoo-commits

commit:     6229954f429f46b955ad17c4f6188409de7e9714
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 11:27:41 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 11:27:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=6229954f

dev-python/pypy-bin: Update for current bin-packages. Clean up.

Package-Manager: portage-2.2.0_alpha188

---
 dev-python/pypy-bin/Manifest              |  5 +----
 dev-python/pypy-bin/pypy-bin-2.0.2.ebuild | 12 +++---------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 27d0715..080f379 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,5 +1,2 @@
 DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
-DIST pypy-bin-2.0.2+bzip2+jit+ncurses+shadowstack+ssl.tar.xz 15089652 SHA256 8e0faf6cb87311b267ef05728da335483892f5454e0ecb0044350bc02e86ba9e SHA512 594b665305e3b4727b6229e4173179836fe70c12a217740ae6e34fa9c960875496492ea60791b879a88e47b3f9ae9887f5671d14bd8396ca3691856408658afd WHIRLPOOL d9a052843cf75beca10e16ba011f96f440f8f0f63eabf82320e0a45b2ca04d71a6fe07f14f67ff4388af709b8a47ee1176b4311bcbe956b5d4bc297673e657d3
-DIST pypy-bin-2.0.2+bzip2+jit+ncurses+ssl.tar.xz 16714288 SHA256 e9f49d213a8872ae9f8797a079e35ba4f3bb1c2e54bca8bab65eea15d5067382 SHA512 95970c568fa24a1c9b183b629a2f94548053d2e90a8f47f890bb65f14ce679945760e8f4e05b03b2911b496cc98f03c1061cdb9a19b85a095f3f5146ce1fdceb WHIRLPOOL c5a0f92c093ea50a2a8b71fcb0697ddd8ef7b4a8ef5cc90f6b46dbc9cd205cd4e1fea4d6660cc4e4488284193402220c8105a36bb5f15bfe7f8f406a53335212
-DIST pypy-bin-2.0.2+bzip2+ncurses+ssl.tar.xz 11306824 SHA256 76f6458a00c22613e2f5a0f5f69728ad69762ce64a47231628a50967f9350b5c SHA512 e2257c1e7a03d468b6e238e17b1cd9578aa6edabb531559120f229475d69be22958badad60f50371ade9aeb67d10990afa6ab338da0f4d7c360f650a306b4a22 WHIRLPOOL d52c15cdf700c9f4c28110c43fcff3cb2e05fe239531bdd00068c5e567fad0b6a56f36694149eafa8e814dec938fb0c9b4336a200fc85285cb6168cca11cdf97
-DIST pypy-bin-2.0.2-doc.tar.xz 1160968 SHA256 65a5859e230d45c363ead08381951b202c15a0669feb0d54ff90c0d683e2ec34 SHA512 20d651f9ba1176314e5c63dea9c992abf74fba211bd1a2ed41a0a0f9c879fd1e126e56407cd07a400e544ee9e9032b229b189741c6344b6e90757d871cd9bb94 WHIRLPOOL 0673deba43481abbb6d138b64b6fa9eef22871088d5c3d9aa64aa06ae829772ebd5874877e00fe8422c5503dd3016e7308b85ecfffc3b5bcec4bef0e1ef118b9
+DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack+ssl.tar.xz 11068444 SHA256 fa00f6af458d4bfff28d178d1bbeb7e0c4a802113f7ff60037a618efedbaebc0 SHA512 90f2b4f9befa58d63d268aaaf26c33d6787cf0f3e0da5e41e684939c2ed3ed060e3cc79a0b599afe6c43213ea374d9806f9ab71de7933930e4176c6213c5af84 WHIRLPOOL c23ff19a0bc7e4c40aadf74d662a107d33953ed9305f2663be5d87b76d097a5d5d3baa020aed8e85906cf59e6650a1ff8f137e251869b32122168db99027e712

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 61639b5..0cbcfe8 100644
--- a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 # XXX: test other implementations
 PYTHON_COMPAT=( python2_7 pypy{1_8,1_9,2_0} )
-inherit pax-utils python-any-r1 versionator
+inherit eutils multilib pax-utils python-any-r1 versionator
 
 BINHOST="http://dev.gentoo.org/~mgorny/dist/${PN}"
 
@@ -15,10 +15,7 @@ HOMEPAGE="http://pypy.org/"
 SRC_URI="mirror://bitbucket/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 	amd64? (
 		bzip2? ( jit? ( ncurses? ( shadowstack? ( ssl? (
-			${BINHOST}/${P}+bzip2+jit+ncurses+shadowstack+ssl.tar.xz
-		) ) ) ) )
-		bzip2? ( !jit? ( ncurses? ( !shadowstack? ( ssl? (
-			${BINHOST}/${P}+bzip2+ncurses+ssl.tar.xz
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack+ssl.tar.xz
 		) ) ) ) )
 	)"
 
@@ -42,8 +39,7 @@ DEPEND="doc? ( dev-python/sphinx )
 PDEPEND="app-admin/python-updater"
 
 # Supported variants
-REQUIRED_USE="bzip2 ncurses !sandbox ssl
-	jit? ( shadowstack )"
+REQUIRED_USE="bzip2 jit ncurses !sandbox shadowstack ssl"
 
 S=${WORKDIR}/pypy-${PV}-src
 
@@ -93,8 +89,6 @@ src_install() {
 
 	einfo "Generating caches and byte-compiling ..."
 
-	cd .. || die
-
 	# Generate Grammar and PatternGrammar pickles.
 	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
 		|| die "Generation of Grammar and PatternGrammar pickles failed"


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] dev/mgorny:master commit in: dev-python/pypy-bin/
@ 2013-07-22  8:45 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2013-07-22  8:45 UTC (permalink / raw
  To: gentoo-commits

commit:     5a3b4a7913cec9a345e5be2d3957427d04fb3207
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 08:45:38 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 08:45:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=5a3b4a79

dev-python/pypy-bin: Update wrt dev-python/pypy & binpackage policy changes. Add missing generated includes. Set up for an initial, testing binpackage.

Package-Manager: portage-2.2.0_alpha188

---
 dev-python/pypy-bin/Manifest              |  2 +-
 dev-python/pypy-bin/metadata.xml          |  1 -
 dev-python/pypy-bin/pypy-bin-2.0.2.ebuild | 46 +++++++++++++++++--------------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 080f379..58488c8 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,2 +1,2 @@
 DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
-DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack+ssl.tar.xz 11068444 SHA256 fa00f6af458d4bfff28d178d1bbeb7e0c4a802113f7ff60037a618efedbaebc0 SHA512 90f2b4f9befa58d63d268aaaf26c33d6787cf0f3e0da5e41e684939c2ed3ed060e3cc79a0b599afe6c43213ea374d9806f9ab71de7933930e4176c6213c5af84 WHIRLPOOL c23ff19a0bc7e4c40aadf74d662a107d33953ed9305f2663be5d87b76d097a5d5d3baa020aed8e85906cf59e6650a1ff8f137e251869b32122168db99027e712
+DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 11073296 SHA256 aef4247888ca89f470d4272c5e6d23e12eeef1424098556a0b71d34e3fdc8861 SHA512 7c56f2e79fea61dccd22fadaa6709b0c5b7905b6b59b2c8a98da4c74eb819f7012c9fb66e667de5f9831305e4b1cf99b317054ddc5718f41ef4b6b52b003f776 WHIRLPOOL dc43d39487a1d5eddaccbd8abfaa3c902c3ff8a87778415d83acd4c740d7e7538888b56d92c37f0946ca3627d9acc489919fe8738c67cbedb87c964af8769ef2

diff --git a/dev-python/pypy-bin/metadata.xml b/dev-python/pypy-bin/metadata.xml
index 02bf3ff..8c56cbd 100644
--- a/dev-python/pypy-bin/metadata.xml
+++ b/dev-python/pypy-bin/metadata.xml
@@ -8,7 +8,6 @@
 		<description>amd64 build maintainer</description>
 	</maintainer>
 	<use>
-		<flag name="sandbox">Enable sandboxing functionality</flag>
 		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
 </pkgmetadata>

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 0cbcfe8..cd3c8ca 100644
--- a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
@@ -14,32 +14,31 @@ DESCRIPTION="A fast, compliant alternative implementation of the Python language
 HOMEPAGE="http://pypy.org/"
 SRC_URI="mirror://bitbucket/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 	amd64? (
-		bzip2? ( jit? ( ncurses? ( shadowstack? ( ssl? (
-			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack+ssl.tar.xz
-		) ) ) ) )
+		jit? ( shadowstack? (
+			${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
+		) )
 	)"
 
 LICENSE="MIT"
 SLOT=$(get_version_component_range 1-2 ${PV})
 KEYWORDS="~amd64"
-IUSE="bzip2 doc +jit ncurses sandbox shadowstack sqlite ssl test +xml"
+IUSE="doc +jit shadowstack sqlite test"
 
 RDEPEND="
+	~app-arch/bzip2-1.0.6
+	~dev-libs/expat-2.1.0
+	~dev-libs/libffi-3.0.13
+	~dev-libs/openssl-1.0.1e
 	~sys-libs/glibc-2.17
+	~sys-libs/ncurses-5.9
 	~sys-libs/zlib-1.2.8
-	~dev-libs/libffi-3.0.13
-	~dev-libs/expat-2.1.0
-	bzip2? ( ~app-arch/bzip2-1.0.6 )
-	ncurses? ( ~sys-libs/ncurses-5.9 )
 	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( ~dev-libs/openssl-1.0.1e )
 	!dev-python/pypy:${SLOT}"
 DEPEND="doc? ( dev-python/sphinx )
 	test? ( ${RDEPEND} )"
 PDEPEND="app-admin/python-updater"
 
 # Supported variants
-REQUIRED_USE="bzip2 jit ncurses !sandbox shadowstack ssl"
 
 S=${WORKDIR}/pypy-${PV}-src
 
@@ -58,12 +57,16 @@ src_prepare() {
 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
 }
 
 src_test() {
-	PYTHONDONTWRITEBYTECODE=1 \
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
 	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
 }
 
@@ -82,12 +85,21 @@ src_install() {
 		rm "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py || die
 	fi
 
-	python_export pypy-c${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
+	# Install docs
+	use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
 
+	python_export pypy-c${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
 	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
-	local -x PYTHONPATH="${ED%/}${INSDESTTREE}/lib_pypy:${ED%/}${INSDESTTREE}/lib-python/2.7"
 
-	einfo "Generating caches and byte-compiling ..."
+	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()" \
@@ -101,10 +113,4 @@ src_install() {
 
 	# compile the installed modules
 	python_optimize "${ED%/}${INSDESTTREE}"
-
-	# Install docs
-	use doc && dohtml -r pypy/doc/_build/html/
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py
-	python_domodule epython.py
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] dev/mgorny:master commit in: dev-python/pypy-bin/
@ 2013-07-23 13:20 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2013-07-23 13:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f472c34ab219aaa1feca3a8163e1240aa4a7189c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 13:21:07 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 13:21:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=f472c34a

dev-python/pypy-bin: Update with builds made by hasufell.

Package-Manager: portage-2.2.0_alpha188

---
 dev-python/pypy-bin/Manifest              | 4 +++-
 dev-python/pypy-bin/pypy-bin-2.0.2.ebuild | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 58488c8..8e18431 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,2 +1,4 @@
 DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
-DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 11073296 SHA256 aef4247888ca89f470d4272c5e6d23e12eeef1424098556a0b71d34e3fdc8861 SHA512 7c56f2e79fea61dccd22fadaa6709b0c5b7905b6b59b2c8a98da4c74eb819f7012c9fb66e667de5f9831305e4b1cf99b317054ddc5718f41ef4b6b52b003f776 WHIRLPOOL dc43d39487a1d5eddaccbd8abfaa3c902c3ff8a87778415d83acd4c740d7e7538888b56d92c37f0946ca3627d9acc489919fe8738c67cbedb87c964af8769ef2
+DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 8626068 SHA256 be44d9900bdb3ac5531935dfe7e1a9416e8ffc2735acf572a85307d4725055a1 SHA512 7e23053a70cec93f1367726061d44d9e92dd03969ad527ba77300b3dffb6a68cd7d26ad7effc710d8db347f32209de959fcd0193be5e2307a9fb32e407d5ba8f WHIRLPOOL 63bfe30fc39c408c1ee6357670e0d112eb32d68127a1f187f55a0e7e1271ae5ec6523ace05902daad38be103ee76426edf346da4a771c73e38c0bdbca3675b45
+DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses.tar.xz 8767680 SHA256 d686e9c423c01c963983951b23a2a0d633c6de6bcfd0088234f10a8501f5b687 SHA512 4b83545fa4b1816d9c57dbc56a0ee575008d3f5ad54cc64afc028042679f2049c4dea5a20cac727d0471197a5f49d6f3f86da35a30920dd9fcd45e645938c53b WHIRLPOOL 5e90f4cf80a2b1a8210a89c930f658799f32eadc23cfd852b3ab7dd5982ef145a0f7c29fcfc61a30be58345cc9e1a6acddc01971667ebf47c3eb5b36ce0923dd
+DIST pypy-bin-2.0.2-amd64+bzip2+ncurses.tar.xz 6071856 SHA256 ea8f5fb3eb069d53897cc04586b1456808b326e79430a58f56fe2d79c2d6ab91 SHA512 6c26abc75c12ed84872d4cccf0c09ec41fb485a1df2f1fa5828a93cb8da8b72ad61ad485370bc8d5d434fde395aa7eb5bb832712ddf8de3a7e4df63eca798a11 WHIRLPOOL 8db15604b1ac00d29479ba48077504d0bb093102686d81adfcae06f0479e4782078b72856f3fda14c241afcf55e3ac75d417376a71b5b9f0e36c639a48b2969c

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 cd3c8ca..4c84e3a 100644
--- a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
@@ -17,6 +17,12 @@ SRC_URI="mirror://bitbucket/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 		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
+		) )
 	)"
 
 LICENSE="MIT"
@@ -39,6 +45,7 @@ DEPEND="doc? ( dev-python/sphinx )
 PDEPEND="app-admin/python-updater"
 
 # Supported variants
+REQUIRED_USE="!shadowstack? ( !jit )"
 
 S=${WORKDIR}/pypy-${PV}-src
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] dev/mgorny:master commit in: dev-python/pypy-bin/
@ 2013-07-23 21:03 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2013-07-23 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     2d9fc16dedbb01dd1717b30e05fccc33498db337
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 21:03:59 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 21:03:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=2d9fc16d

dev-python/pypy-bin: Fix REQUIRED_USE.

Package-Manager: portage-2.2.0_alpha188

---
 dev-python/pypy-bin/pypy-bin-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 4c84e3a..bf7797b 100644
--- a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
@@ -45,7 +45,7 @@ DEPEND="doc? ( dev-python/sphinx )
 PDEPEND="app-admin/python-updater"
 
 # Supported variants
-REQUIRED_USE="!shadowstack? ( !jit )"
+REQUIRED_USE="!jit? ( !shadowstack )"
 
 S=${WORKDIR}/pypy-${PV}-src
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] dev/mgorny:master commit in: dev-python/pypy-bin/
@ 2013-07-24 20:59 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2013-07-24 20:59 UTC (permalink / raw
  To: gentoo-commits

commit:     7b217c92b5349c339b4a693484ffd1875373f974
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 20:59:41 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 20:59:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=7b217c92

dev-python/pypy-bin: Update with new binpackages from hasufell and xmw.

Package-Manager: portage-2.2.0_alpha188

---
 dev-python/pypy-bin/Manifest              |  7 ++++---
 dev-python/pypy-bin/pypy-bin-2.0.2.ebuild | 31 +++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 8e18431..c5547c8 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,4 +1,5 @@
 DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c SHA512 5b8b56194dff468dd249dea0014fadafb791eb69858ffae0b9c7638f087df277a84ddadc7d5b0fdb48a12ca8e6b70eb95cb5b7a5f56fe8fe3396820b814ecfd7 WHIRLPOOL bb1f71e0b2d3e145edcb1baa17b0a13c09f5229cf1b0532edbb3d0d5c87ef39543c0ef6b9dc7ce2778c4a3336d4a1580fce9cf960f82b72ddfed02e06d10d8af
-DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 8626068 SHA256 be44d9900bdb3ac5531935dfe7e1a9416e8ffc2735acf572a85307d4725055a1 SHA512 7e23053a70cec93f1367726061d44d9e92dd03969ad527ba77300b3dffb6a68cd7d26ad7effc710d8db347f32209de959fcd0193be5e2307a9fb32e407d5ba8f WHIRLPOOL 63bfe30fc39c408c1ee6357670e0d112eb32d68127a1f187f55a0e7e1271ae5ec6523ace05902daad38be103ee76426edf346da4a771c73e38c0bdbca3675b45
-DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses.tar.xz 8767680 SHA256 d686e9c423c01c963983951b23a2a0d633c6de6bcfd0088234f10a8501f5b687 SHA512 4b83545fa4b1816d9c57dbc56a0ee575008d3f5ad54cc64afc028042679f2049c4dea5a20cac727d0471197a5f49d6f3f86da35a30920dd9fcd45e645938c53b WHIRLPOOL 5e90f4cf80a2b1a8210a89c930f658799f32eadc23cfd852b3ab7dd5982ef145a0f7c29fcfc61a30be58345cc9e1a6acddc01971667ebf47c3eb5b36ce0923dd
-DIST pypy-bin-2.0.2-amd64+bzip2+ncurses.tar.xz 6071856 SHA256 ea8f5fb3eb069d53897cc04586b1456808b326e79430a58f56fe2d79c2d6ab91 SHA512 6c26abc75c12ed84872d4cccf0c09ec41fb485a1df2f1fa5828a93cb8da8b72ad61ad485370bc8d5d434fde395aa7eb5bb832712ddf8de3a7e4df63eca798a11 WHIRLPOOL 8db15604b1ac00d29479ba48077504d0bb093102686d81adfcae06f0479e4782078b72856f3fda14c241afcf55e3ac75d417376a71b5b9f0e36c639a48b2969c
+DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 9652340 SHA256 100c1119fe08c47d1a15ca6c98b91c510f41c670d87526fb392e3b292d791ac3 SHA512 ac8d91e740fc8a49860ec47717b160a59ac68807aabd8ddc3a578682d6d75d3ddd47bc5e8b7db6e2be0af5f9414596831372225ab657194ba72d22c2360f98c0 WHIRLPOOL 5dc07128fc8db9df062053803a2792eb6f3795cf2cdef5d011a594c73a158bb4061fcd862c39eb074805f0b4e46d0846708f3fd0fdf3464b02cbe8efa406bb1f
+DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses.tar.xz 10469416 SHA256 4f8a64d8cc679b8ba6751fc47307df679bca2658848d009c8c724682c76fbf0a SHA512 1d1bedc80d12982074a09516674bee71e57bac9b2b9dac1d9834295edb3b8fb79c0e93de708eef0dbf232dd198a4a728b09a9f86ab5dabad8a293072446b2a2b WHIRLPOOL 08753da5e1e6361bd21b03813cb4482164cc2933d8bf2a2d7443379b1be1b6ac0b87fde571af8519e7fa9e14893bb570799ad6dae02ba42a936dc4d964b0e821
+DIST pypy-bin-2.0.2-amd64+bzip2+ncurses.tar.xz 6527192 SHA256 ff2ac88da94978388b20d54b0a2add839facc5e605c54cc7bfd96faa088ec266 SHA512 58b9e6acc9038b4aeccadf0f1dd257b320cca8e536edd2835c0d9b95f27268b3b71e3af59daa4033580f2fc43f590205e1ed6de2fe475c60cf00c1a781ad1f86 WHIRLPOOL b5410e2b7a0816dffb64b32169be82193820c345d5b4000dc3fd8f827ce82a783fe62605efc0be7794d38dbdeb59d68cf0ac46c62f24f4a8025a2506739db4d1
+DIST pypy-bin-2.0.2-x86+bzip2+ncurses.tar.xz 5137536 SHA256 c34e60673346b59022560608f633962dee47d79b96e4015677e86f507ad61248 SHA512 0d737a7d5018d6a4d70d3c0921ed4d8882bce4e6f9ff2b9742ab1763cc760a4ed22fcf683e4e7a1693f35897fa4d20500e6d5a31803e34b15175f4081a2ec6d8 WHIRLPOOL 04de2b1aa32f1a098d38b2b0512822c24385bed9db94f0cad03611a45e189812654f2f33ea6dad1a71a77bab878a8109ddf9c8873dc127a49352adac2a8ff7df

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 bf7797b..8eb98c6 100644
--- a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
@@ -23,30 +23,45 @@ SRC_URI="mirror://bitbucket/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 		!jit? ( !shadowstack? (
 			${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
 		) )
+	)
+	x86? (
+		!sse2? (
+			!jit? ( !shadowstack? (
+				${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
+			) )
+		)
 	)"
 
+# Supported variants
+REQUIRED_USE="!jit? ( !shadowstack )
+	x86? ( !jit !shadowstack !sse2 )"
+
 LICENSE="MIT"
 SLOT=$(get_version_component_range 1-2 ${PV})
 KEYWORDS="~amd64"
-IUSE="doc +jit shadowstack sqlite test"
+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/openssl-1.0.1e
-	~sys-libs/glibc-2.17
+	|| ( ~dev-libs/libffi-3.0.13
+		~dev-libs/libffi-3.0.12
+		~dev-libs/libffi-3.0.11 )
+	|| ( ~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 )
 	~sys-libs/ncurses-5.9
-	~sys-libs/zlib-1.2.8
+	|| ( ~sys-libs/zlib-1.2.8
+		~sys-libs/zlib-1.2.7 )
 	sqlite? ( dev-db/sqlite:3 )
 	!dev-python/pypy:${SLOT}"
 DEPEND="doc? ( dev-python/sphinx )
 	test? ( ${RDEPEND} )"
 PDEPEND="app-admin/python-updater"
 
-# Supported variants
-REQUIRED_USE="!jit? ( !shadowstack )"
-
 S=${WORKDIR}/pypy-${PV}-src
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] dev/mgorny:master commit in: dev-python/pypy-bin/
@ 2013-07-24 21:26 Michał Górny
  0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2013-07-24 21:26 UTC (permalink / raw
  To: gentoo-commits

commit:     2522e2acf4036a8491e18619380eccef795fa232
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 21:26:22 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 21:26:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=2522e2ac

dev-python/pypy-bin: Add x86 SSE2 ebuilds by hasufell.

Package-Manager: portage-2.2.0_alpha188

---
 dev-python/pypy-bin/Manifest              |  3 +++
 dev-python/pypy-bin/pypy-bin-2.0.2.ebuild | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index c5547c8..c3f7a42 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -2,4 +2,7 @@ DIST pypy-2.0.2-src.tar.bz2 14819848 SHA256 1991c90d6b98e2408b3790d4b57b71ec1c69
 DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 9652340 SHA256 100c1119fe08c47d1a15ca6c98b91c510f41c670d87526fb392e3b292d791ac3 SHA512 ac8d91e740fc8a49860ec47717b160a59ac68807aabd8ddc3a578682d6d75d3ddd47bc5e8b7db6e2be0af5f9414596831372225ab657194ba72d22c2360f98c0 WHIRLPOOL 5dc07128fc8db9df062053803a2792eb6f3795cf2cdef5d011a594c73a158bb4061fcd862c39eb074805f0b4e46d0846708f3fd0fdf3464b02cbe8efa406bb1f
 DIST pypy-bin-2.0.2-amd64+bzip2+jit+ncurses.tar.xz 10469416 SHA256 4f8a64d8cc679b8ba6751fc47307df679bca2658848d009c8c724682c76fbf0a SHA512 1d1bedc80d12982074a09516674bee71e57bac9b2b9dac1d9834295edb3b8fb79c0e93de708eef0dbf232dd198a4a728b09a9f86ab5dabad8a293072446b2a2b WHIRLPOOL 08753da5e1e6361bd21b03813cb4482164cc2933d8bf2a2d7443379b1be1b6ac0b87fde571af8519e7fa9e14893bb570799ad6dae02ba42a936dc4d964b0e821
 DIST pypy-bin-2.0.2-amd64+bzip2+ncurses.tar.xz 6527192 SHA256 ff2ac88da94978388b20d54b0a2add839facc5e605c54cc7bfd96faa088ec266 SHA512 58b9e6acc9038b4aeccadf0f1dd257b320cca8e536edd2835c0d9b95f27268b3b71e3af59daa4033580f2fc43f590205e1ed6de2fe475c60cf00c1a781ad1f86 WHIRLPOOL b5410e2b7a0816dffb64b32169be82193820c345d5b4000dc3fd8f827ce82a783fe62605efc0be7794d38dbdeb59d68cf0ac46c62f24f4a8025a2506739db4d1
+DIST pypy-bin-2.0.2-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 7754056 SHA256 b10da2cede4c04299730ac3e001b269b81c42584b8b09bff78098fe94218a78c SHA512 b512b67a4de9bdacb1f4e13888fefd4ed2ca4bb9ca3ffecafa825e6ddc36bb62cd4eff34e23c8f9a4baf9f601544cdb59d5249a240932109d98dba532e2915d1 WHIRLPOOL 187cbe9e2778243ff7c82ca4fa25705ff78be216dc66547a4f4f4b78eba4854ce11b843170b76cb17ea34d85647dfbdb664b4394c3641ffe364e2f91eb21e9aa
+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

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 8eb98c6..effbbd0 100644
--- a/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.0.2.ebuild
@@ -25,6 +25,17 @@ SRC_URI="mirror://bitbucket/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 		) )
 	)
 	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
@@ -34,7 +45,7 @@ SRC_URI="mirror://bitbucket/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
 
 # Supported variants
 REQUIRED_USE="!jit? ( !shadowstack )
-	x86? ( !jit !shadowstack !sse2 )"
+	x86? ( !sse2? ( !jit !shadowstack ) )"
 
 LICENSE="MIT"
 SLOT=$(get_version_component_range 1-2 ${PV})


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-07-24 21:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-23 13:20 [gentoo-commits] dev/mgorny:master commit in: dev-python/pypy-bin/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2013-07-24 21:26 Michał Górny
2013-07-24 20:59 Michał Górny
2013-07-23 21:03 Michał Górny
2013-07-22  8:45 Michał Górny
2013-07-21 11:27 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox