diff options
author | Dirkjan Ochtman <djc@gentoo.org> | 2011-11-30 08:57:27 +0000 |
---|---|---|
committer | Dirkjan Ochtman <djc@gentoo.org> | 2011-11-30 08:57:27 +0000 |
commit | 67f8f4fc0e0f074b550969d3862085ceb81b3829 (patch) | |
tree | 29a7c465aeadb4dff706706567ce1c90b2d37c14 /dev-python | |
parent | Update supported pypy ABIs. (diff) | |
download | gentoo-2-67f8f4fc0e0f074b550969d3862085ceb81b3829.tar.gz gentoo-2-67f8f4fc0e0f074b550969d3862085ceb81b3829.tar.bz2 gentoo-2-67f8f4fc0e0f074b550969d3862085ceb81b3829.zip |
Remove old pypy version.
(Portage version: 2.1.10.39/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
-rw-r--r-- | dev-python/pypy/ChangeLog | 6 | ||||
-rw-r--r-- | dev-python/pypy/files/1.5-patches.patch | 41 | ||||
-rw-r--r-- | dev-python/pypy/pypy-1.5.ebuild | 79 |
3 files changed, 5 insertions, 121 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/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 -} |