Drop some random cruft, and localize LD_LIBRARY_PATH. Drop old.

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

4 files changed, 23 insertions, 200 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 935e51aab619..2b77fad345fc 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,10 @@
 # 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.68 2014/07/06 13:18:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.69 2014/07/12 21:31:08 mgorny Exp $
+
+  12 Jul 2014; Michał Górny <mgorny@gentoo.org> -pypy-2.3.ebuild,
+  pypy-2.3.1.ebuild:
+  Drop some random cruft, and localize LD_LIBRARY_PATH. Drop old.
 
   06 Jul 2014; Michał Górny <mgorny@gentoo.org> pypy-2.0.2-r1.ebuild,
   pypy-2.2.1.ebuild, pypy-2.3.ebuild:
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 101f954d89fa..caef6304b402 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -8,30 +8,28 @@ AUX 2.1-distutils-fix_handling_of_executables_and_flags.patch 15065 SHA256 bfac2
 AUX 2.3-21_all_distutils_c++.patch 14825 SHA256 99fc72d254a903a5445c991ac5e1f7ab95d1df6dde684250e145bd908131ebda SHA512 8b53016ae48cae39e9fee030fa18b9cebb72bf72b180be1a0a605a97ab6a0ad62d32317f459728a324f83179ec624885bd3cbe61ac0b5594690cca0c0e74c76e WHIRLPOOL 6718f3e998f0d7174e7088881c74d0e2063e935b5610e076eaf2233ee84f6478c0a1689f5d01de9aeb8f53a97ed73fb4957de16be4adc83045b21c48b93e8646
 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
-DIST pypy-2.3-src.tar.bz2 14658373 SHA256 be2c271e7f9d7c0059a551ba1501713c00336e551e7f13107f0f34c721d95b0c SHA512 fbbe8fb06abdee9e0cd330ebeb6ea4769d3d0bf1271f84ed5b8fc94558b72abda677f17ef2c743160b823287cf901aefb139a7eb56f5252e082d525a0806f33c WHIRLPOOL f0f771c0c9e91fedbcac97ad0e9f318c379c6d343af2450f98f9000b032867eea89a53fff0895f48da22a4327a24440319fe7efddb56d24a80b8e4aedfa0c91d
 DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 SHA512 86aab86c5f413cdd6a56680915605de5c1416255b43a8dce1b4dcf8f1febdb3275076a4a9c7de30002387d59e4171a52da2528436eb205d8d947de7edd049c65 WHIRLPOOL c78d41240f1803d9461f797fd0ef647a40a6990a4e3a504e80a0eaaf460d052bb60fe6240cacdb3ee8737500c9c7f418b1d55c619d01ac7b73aace3d82157aa6
 EBUILD pypy-2.0.2-r1.ebuild 4238 SHA256 5daf6f2699b734e0f4812de31472ee0f8beef335a892f233e2a5243327305214 SHA512 83e093cfc1e66f7e63d660d17d4c9e669f80fdb33eaa708b34e6a3c5008cc9e65d5107e41abc8557645eaecf9139cba596e87a7738042efdcf60306b3140509d WHIRLPOOL d35333732552971bf29cacfba6c73b45616f43dd20626384beba8488bf3b9092e9a8cec0b02ea2e62ef9a3a0ccb2f5599e068ddb239f3221ce61a2f17c045f73
 EBUILD pypy-2.2.1.ebuild 4607 SHA256 8c2b5bf6168831e5231a5af1fab6faeb9615c5675039d387a662db8d4afc711e SHA512 dd0a8594d4cd294a2100b02be56f99f2db86f573e75f5c34eb4db6fd40b2925806ec34586ff656226a20577322944b8d0b166677692b49fa8828bac24992e865 WHIRLPOOL 92646486accd408db4a4e671c390c806ebc4d7f256636f8c642e290ad5200d4e5b9d26a4620f2fe1cbecb4c2ff608abd0b37ce566619b192e218e3be0d0c5e77
-EBUILD pypy-2.3.1.ebuild 4865 SHA256 9ca0aa8c236ccf666cfd374f38c217680d860815e14f832fc5f2947f5e0bf847 SHA512 00fd1f2538791f34f16b90b0c19c154390a17ed8e76c03ca740825de1bf0e288e28eca479f8fc1385fe43c156f0d9e6fa995ebc684aa4666e1938cff92939e2a WHIRLPOOL 445c8fa03843e2f868e9e1b473af0199fccf80576a95c002be4ed4f65b623c21d42c621de5c4062d26c562ed828b5323b627fc72ee6d6d65cdbb64794e450d24
-EBUILD pypy-2.3.ebuild 4609 SHA256 dda7a2739ef6c1d00334cb7172db49bcff5374e20cf39b82141c46fee93740e7 SHA512 2913717a94df206a01af59880fda6f6c0127d99d8405c37fed028af351385f72abf7efc206db6623a03951e54baa2f7c1dcf0e4921fe7122f49f2f4cc64b9994 WHIRLPOOL 90b6b24a01f921ec78ca94e6737853da0d9f8031f02fcbf3b74145cef0c27d0de95081e0e38128f9fb64080e63fc52f3a5988b7dfd527a8019732f9fe4340a47
-MISC ChangeLog 12745 SHA256 c23b0ffee9f2536a5b8dead272fbafad2054e406c2bc2b50bf20b22bc6e0500f SHA512 686b899a9a7b655dba1a8a9810fb330a83ddd74163dd16c7e5057438c85ba0c17c8804f684b920ebd5d2419820db65e90e6ebb627e89706f51ae35635b61b0f2 WHIRLPOOL af736b236ef11777e2d6a088954b3cd6fff88380ef9e4dbfdfabe8ef22e45abf903de52fc4a555fed4270d8fb0d9e706fd430f5d3ffb046adaa65692e0beaaf3
+EBUILD pypy-2.3.1.ebuild 4841 SHA256 ecb79b4d47b87fd61b0981e0d5726103c9503b3b47a9015ec76d81b27c48da49 SHA512 aed986b614b84e584fa58c8fc232e56cfd71119073feb3ff5b3e4d9aa137ad40b85730db4a25eff60e52b7af26ad40c8ad571d9fcb96776837b2b1d3766addc2 WHIRLPOOL e3174e61f243c400334604ef911c6541c25915ab7d7bd66adde7fc2e77405fefd8220cd22c54070a75bd753f51496230a6798042388d77bec12052cdd076b9cd
+MISC ChangeLog 12901 SHA256 90e2c46ae50e5a9c648edd0a9036686c7ca7673b8673f401290f4fb4ea7123d7 SHA512 a680e110c71a4d77abfabee7374b4a5be203ff3d97c2a4171a07c6ecced814560d9ac435b55b4535b0c285fea8a029bea400278605877916a0b4734d9ac2df73 WHIRLPOOL 16ede5f51e895fa5d69c5d48d77986fe097fe6412835a13eba06b1182099094fe7147d5cd5ae351a465f97dac78f8ab66eefbd346ad97cb39e91ade68fd0e833
 MISC metadata.xml 490 SHA256 83fa771c99b84586c0ab24e534b52285b03dc33d3fcbed250b193517a45f7e1e SHA512 2493a473927dd1fa6326623e14090abccd988fb74d1de9a523d1cfc745ef1ed3d0c78d48b53c65fced305c38ba6463414940b2a04bfe0935248dcb92be863dda WHIRLPOOL 25ecd13efa803060bfaf9ae9afcfc91d5ab65c70b5c67a77c14a81a73215a4adbad51568ac070f87432b6e3f45d2fccab2fdbebbb4fdac631cc8bfd27d4a6649
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTuUzDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTwakeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1zkQANtTX3i6plKrgy8J1RPMsbVX
-M1ks7JdzQ4sQrH9RbJiXPTsqQ2ClTvI8uJIJCyUcwE9Az5X/l4nYhoiBb5nN815p
-7E53Ds6AmB3tQuglzecQPU9EKTH16n2RjUHqDicEs1GXJESqxxgLj3MRx9t8pv9M
-aRCaczsc3e6ksp5d392/CKj1MeC9F4kNd/20wR/2Fqfkt8c+60V4H5DPtFdGplFJ
-RF5J3jSX16vc4XydQbgN5U5ruKNAffc0+WjvnSSQseWITxsTsAzxNkKZuLeQDhwT
-zfrOoqzaHVuJS+f33iEOwDM/WIHVrhVIRmAYSk1n4SISzay+JXQcj6dsYkgkuoRL
-mQ3R8u4mg9ZNxmW0GvZyDIqh8QRjzxuTHeM2UjCbOJmWj4lUF+MFS35Hy8+rTI2I
-YRe6Ubx3QaxgQjOyhu4z2+PtCjmm+U16ccjAi+4BYDZIZbbrcFC3tyuDDGMaG/vZ
-g37P29bj5FdF0Ba4M6WQp0ZUpLCkUd5fOBsdMp2c7tE9muF9n8qddw6nXvtmgZQ8
-WfFTk6IyYN1CaeNg9EZdmkaROob0yflqDBrkPqOHzoel6Ex0F6Qqgvp/wlnNDnnG
-AfpyuusUC08XUufmj6nVvVwxdkbYH43jj8kMN6mtx3dNCVZxIEhca0r68INOhr3l
-5btCmMr+FaiSZUEjMO2G
-=fNli
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVckP/iJWwZr1g6mo9SMhVx17huG5
+0MZORRUaO7t9i6Fa0egxgPi64izqP64ro6uhj2xqKAiqMlvC80jyHRrXFK3JR4NW
+s6j/PgWzMcKwZDiH+iCpfcrT8BRn6rPT6un4RA2epyfG7/cQTtAodQ297MN8BD7V
+GHvYvzQoiOd5ZOcN0Y4UaX34m6HRaJO8aWAh+rnbb6coGeK9T78xSN5vMj+YSZdn
+vhehL9FqlWE01khFc7W+2VQHF53m6vvMc7iU8DrQkluCADhdRCK9ghSXrk+I95mg
+cxeMVKzoeySKy2fgTRIwQe/VzUEOds7qqcP6piUiLui56lP9hWGSUlYkNCRU9vqD
+FhiqSjwL2quejJpNHZ3Z1HbY0R5MP05iUMJXVIIgdqqDfSrpUOFwcPO030CLL7pB
+g/nhEm7MJGiKk4bRffo54BczUiOI2UtNrFhQFxWM0rFNMCBKCQpFvnAySkdrQnBE
+kXQmQEj5uw4VBfwkjx39jOb2xepT4Cpjit9scTwT9wshRsGOsiVfBBv0gdtbRCY/
+WJGvKlq8fo0IaHOlmYwvxJKcP8r9XZfeF/+TM/QtOctX+aSGc+fHNqRI7gcWscOD
+0kt/xq7LhNxWakM+T6nZ35f1wPe3u+7RLrIXB342MQTctFjPmwLdC7eZ5fD8ISDM
+wRyvnKU+qAx4isKaeL0V
+=MKIv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/pypy-2.3.1.ebuild b/dev-python/pypy/pypy-2.3.1.ebuild
index 78cd246f638a..b12f1d0af7fa 100644
--- a/dev-python/pypy/pypy-2.3.1.ebuild
+++ b/dev-python/pypy/pypy-2.3.1.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/pypy-2.3.1.ebuild,v 1.1 2014/06/18 23:37:41 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.3.1.ebuild,v 1.2 2014/07/12 21:31:08 mgorny Exp $
 
 EAPI=5
 
@@ -133,7 +133,6 @@ src_install() {
 	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
 	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
 	dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so
-	einfo "pax-mark 2 done"
 	dodoc README.rst
 
 	if ! use sqlite; then
@@ -154,7 +153,7 @@ src_install() {
 
 	python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
 	local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
-	export LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py
 	python_domodule epython.py
diff --git a/dev-python/pypy/pypy-2.3.ebuild b/dev-python/pypy/pypy-2.3.ebuild
deleted file mode 100644
index 4158d377aa25..000000000000
--- a/dev-python/pypy/pypy-2.3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# 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.3.ebuild,v 1.3 2014/07/06 13:18:53 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy pypy2_0 )
-inherit check-reqs eutils multilib multiprocessing pax-utils \
-	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://www.bitbucket.org/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 tk"
-
-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 )
-	tk? (
-		dev-lang/tk:0
-		dev-tcltk/tix
-	)
-	!dev-python/pypy-bin:0"
-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
-}
-
-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"
-
-	pushd lib-python/2.7 > /dev/null || die
-	epatch "${FILESDIR}/2.3-21_all_distutils_c++.patch"
-	popd > /dev/null || die
-
-	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 \
-			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
-			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
-			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.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
-
-	# 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 (cffi)"
-	"${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
-	if use sqlite; then
-		"${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
-	fi
-	if use tk; then
-		"${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)"
-	fi
-
-	# Cleanup temporary objects
-	find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
-	find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
-
-	# compile the installed modules
-	python_optimize "${ED%/}${INSDESTTREE}"
-}