Remove old pypy version.

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

4 files changed, 9 insertions, 128 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 01249b96fe30..9baff3af4c75 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pypy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.3 2011/11/30 08:49:18 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.4 2011/11/30 08:57:27 djc Exp $
+
+  30 Nov 2011; Dirkjan Ochtman <djc@gentoo.org> -files/1.5-patches.patch,
+  -pypy-1.5.ebuild:
+  Remove old version.
 
 *pypy-1.7 (30 Nov 2011)
 
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 5767ca470185..cbbe29c9260f 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX 1.5-patches.patch 2054 RMD160 5c2374be42afe88706e465246a15ea608ad969f4 SHA1 2a4cd500dbdf3bb3d55cee52abf27ca0b4f4ed72 SHA256 e2b499a68e9c27869462dd902629e3e1da682dca5cc8b3a5f1888f28e27158da
 AUX 1.7-patches.patch 1842 RMD160 ee42ff2383477353cf0230a8567b22d87a4b4d56 SHA1 4fa9f1ac91b3b5466e21d8d58dbc9f09b1fd90dd SHA256 1417373a73221b65dcccdee1539a7a11018384ea3f7908cacc2e07b525ebe291
 AUX 1.7-scripts-location.patch 412 RMD160 811c3cc38370f97274f8ec5cc36f34b3e79dae56 SHA1 c03fa9679443ed9461829745f5bb00cfecd3eb22 SHA256 abc39fbbf69d1d6b478a4a16626950e8e0b607fb05c6e1e1c10618c59fccdda9
-DIST pypy-1.5-src.tar.bz2 14181501 RMD160 9c7d479ac5cd51c3789f3db99674b4c2936d88e0 SHA1 0ebcecaa4c725bf1a48272033d9f429b8a82b7e1 SHA256 1e827769d2384e38c358da0d2a7e87e843c819675c844dec503c475255490ad0
 DIST release-1.7.tar.bz2 14842336 RMD160 f94199989fc7eab30d256b341367e82049b84745 SHA1 db16d92db6b76960b76328f821c8c50a6d66864e SHA256 2e0884f4696cc8617be73cb8af8da063073d685b3d3e5de3366bfae4d33fac16
-EBUILD pypy-1.5.ebuild 2131 RMD160 6f287ec56a2099061fc8ce7955b4923829efe5b7 SHA1 031e3fdc4e9614568cbf86613624cdd8505927b0 SHA256 57df0b0ca57ec9dc69284b5bdfaee77786e0fc2c1bfe204a0835968a9f246111
 EBUILD pypy-1.7.ebuild 2263 RMD160 a508d311d32092e74297c1ac5bd92694c4047694 SHA1 5a1222e7317fba9eb4d6e34f1ced003efc8ea303 SHA256 292ce9f325b9eae96922f8eb6be8aba7e10122f7163c7e1ade4688ef3f189b4d
-MISC ChangeLog 698 RMD160 a966f797353f41234b38b986fd9e4fd3d4c83c08 SHA1 103ebbf94f25f9ce4e608ea7370a9f5f7c8d1590 SHA256 d49aacc80f572979b6638254877e79bf78775fa8eedc4d26103d0dc40e3aad23
+MISC ChangeLog 815 RMD160 46615ba084bad93509ebeaf8b5bda04321117594 SHA1 47c761b199e0e3f393e271f6c51ba00843b4e2ff SHA256 52749a88be42c950671bf271e4ad82db9a39309818133457acbccc92a0765029
 MISC metadata.xml 344 RMD160 4bd17fc59db518f8bc618d4dea646125bac847e8 SHA1 e4e25b65789bae8aaeb01ee897ca594d935287d6 SHA256 ba7629d47b3bf832a55ad33e58d361492b2f366a5d3a948f981862bdd1d54d73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk7V7jEACgkQxeMuLWsGW/uRaQCfaEMDPkiokK7hs1blXW0/hAwG
-zKgAoKEzjQ6DuJEdhh7FzUDu4Opfi/V+
-=jkjN
+iEYEAREKAAYFAk7V8B0ACgkQxeMuLWsGW/s6PgCgijRA82cEWvEno+eBIC2CmqQC
+YeEAn23a099zO4H1Uqsof9nfPVPRY8EI
+=J2HR
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/files/1.5-patches.patch b/dev-python/pypy/files/1.5-patches.patch
deleted file mode 100644
index 92fb524ee168..000000000000
--- a/dev-python/pypy/files/1.5-patches.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur pypy-1.5-src_orig/pypy/rlib/ropenssl.py pypy-1.5-src/pypy/rlib/ropenssl.py
---- pypy-1.5-src_orig/pypy/rlib/ropenssl.py	2011-04-30 17:18:50.000000000 +0300
-+++ pypy-1.5-src/pypy/rlib/ropenssl.py	2011-05-07 16:22:21.387000017 +0300
-@@ -98,6 +98,7 @@
- ssl_external('SSL_load_error_strings', [], lltype.Void)
- ssl_external('SSL_library_init', [], rffi.INT)
- if HAVE_OPENSSL_RAND:
-+    eci.includes = eci.includes + ('openssl/rand.h',);
-     ssl_external('RAND_add', [rffi.CCHARP, rffi.INT, rffi.DOUBLE], lltype.Void)
-     ssl_external('RAND_status', [], rffi.INT)
-     ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT)
-diff -ur pypy-1.5-src_orig/pypy/translator/goal/translate.py pypy-1.5-src/pypy/translator/goal/translate.py
---- pypy-1.5-src_orig/pypy/translator/goal/translate.py	2011-04-30 17:18:50.000000000 +0300
-+++ pypy-1.5-src/pypy/translator/goal/translate.py	2011-05-06 23:32:58.855999980 +0300
-@@ -253,7 +253,6 @@
-             log.event("batch mode, not calling interactive helpers")
-             return
-         
--        log.event("start debugger...")
- 
-         if translateconfig.view:
-             try:
-@@ -264,7 +263,6 @@
-             page = graphpage.TranslatorPage(t1, translateconfig.huge)
-             page.display_background()
- 
--        pdb_plus_show.start(tb)
- 
-     try:
-         drv = driver.TranslationDriver.from_targetspec(targetspec_dic, config, args,
-diff -ur pypy-1.5-src_orig/pypy/translator/c/gcc/trackgcroot.py pypy-1.5-src/pypy/translator/c/gcc/trackgcroot.py
---- pypy-1.5-src_orig/pypy/translator/c/gcc/trackgcroot.py	2011-05-27 12:41:49.005000002 +0300
-+++ pypy-1.5-src/pypy/translator/c/gcc/trackgcroot.py	2011-05-27 12:56:16.292000001 +0300
-@@ -1640,6 +1640,7 @@
-             }
-             """
-         elif self.format in ('elf64', 'darwin64'):
-+            print >> output, "\t.section .note.GNU-stack,\"\",%progbits"
-             print >> output, "\t.text"
-             print >> output, "\t.globl %s" % _globalname('pypy_asm_stackwalk')
-             _variant(elf64='.type pypy_asm_stackwalk, @function',
diff --git a/dev-python/pypy/pypy-1.5.ebuild b/dev-python/pypy/pypy-1.5.ebuild
deleted file mode 100644
index 9c23b2ab4367..000000000000
--- a/dev-python/pypy/pypy-1.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.5.ebuild,v 1.2 2011/06/24 09:18:38 djc Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs check-reqs python versionator
-
-DESCRIPTION="PyPy is a very compliant implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="http://pypy.org/download/pypy-${PV}-src.tar.bz2"
-SLOTVER=$(get_version_component_range 1-2 ${PV})
-
-LICENSE="MIT"
-SLOT="${SLOTVER}"
-PYTHON_ABI="2.7-pypy-${SLOTVER}"
-KEYWORDS="~amd64"
-IUSE="doc examples +jit sandbox stackless test bzip2 ncurses xml ssl"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-		virtual/libffi
-		virtual/libintl
-		bzip2? ( app-arch/bzip2 )
-		ncurses? ( sys-libs/ncurses )
-		xml? ( dev-libs/expat )
-		ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-PDEPEND="app-admin/python-updater"
-
-S="${WORKDIR}/${P}-src"
-DOC="README LICENSE"
-
-src_prepare() {
-	CHECKREQS_MEMORY="1250"
-	use amd64 && CHECKREQS_MEMORY="2500"
-	check_reqs
-	epatch "${FILESDIR}/${PV}-patches.patch"
-}
-
-src_compile() {
-	if use jit; then
-		conf="-Ojit"
-	else
-		conf="-O2"
-	fi
-	if use sandbox; then
-		conf+=" --sandbox"
-	fi
-	if use stackless; then
-		conf+=" --stackless"
-	fi
-	conf+=" ./pypy/translator/goal/targetpypystandalone"
-	# Avoid linking against libraries disabled by use flags
-	optional_use=("bzip2" "ncurses" "xml" "ssl")
-	optional_mod=("bz2" "_minimal_curses" "pyexpat" "_ssl")
-	for ((i = 0; i < ${#optional_use[*]}; i++)); do
-		if use ${optional_use[$i]};	then
-			conf+=" --withmod-${optional_mod[$i]}"
-		else
-			conf+=" --withoutmod-${optional_mod[$i]}"
-		fi
-	done
-
-	translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py $conf"
-	echo ${_BOLD}"${translate_cmd}"${_NORMAL}
-	${translate_cmd} || die "compile error"
-}
-
-src_install() {
-	INSPATH="/usr/$(get_libdir)/pypy${SLOT}"
-	insinto ${INSPATH}
-	doins -r include lib_pypy lib-python pypy-c || die "failed"
-	fperms a+x ${INSPATH}/pypy-c || die "failed"
-	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
-}
-
-src_test() {
-	$(PYTHON -2) ./pypy/test_all.py --pypy=./pypy-c lib-python
-}