Remove old versions of pypy.

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

5 files changed, 10 insertions, 249 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 9eedca0e5e28..9ff5a24329fe 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pypy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.17 2012/02/28 19:24:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.18 2012/06/08 16:34:26 djc Exp $
+
+  08 Jun 2012; Dirkjan Ochtman <djc@gentoo.org> -files/1.7-patches.patch,
+  -pypy-1.7-r2.ebuild, -pypy-1.8.ebuild:
+  Remove old versions.
 
   28 Feb 2012; Mike Gilbert <floppym@gentoo.org> pypy-1.7-r2.ebuild,
   pypy-1.8-r1.ebuild:
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 4ee15f3c1ac2..2435e198f582 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-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
 AUX 1.8-elf-metadata-26a8d3fc57a7.patch 569 RMD160 de5a440cb41ab0249141304c12f9a35af1565c87 SHA1 57daa224b13ec3e6cf7f23d02d896527137dca6b SHA256 8c695811ca9eae7d3b81674e8de255dc84e242972041ca54093a3d96f40fe34b
 AUX 1.8-sext-instructions-02dc2f6160ee.patch 1100 RMD160 c1f83411a70af07c0987ac51c81806de70a5d991 SHA1 8430932adfaadf903a1ad5a4635644157e04ee78 SHA256 599af03fb41902cb00b6c1768febd921276efbdc7b550d010676cc210f7564bb
 AUX pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch 18064 RMD160 8e86cff09340448f3e49ccc626efa40e9463273a SHA1 533cad04bc8d96e2ba1a09e8249a3efd97e46b1d SHA256 43cbabdf5f7b094eb969c754bb6513fa324b1fadb40b37d78bd1ad47194d787a
 AUX pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 569 RMD160 540aa0881ea1fef56cea3734fa09f5c3366d5bb0 SHA1 5f4939129a9a56c9f9da0e82851f675fd7c73209 SHA256 55ea809a5f3e264b1905b06aa3af78aae149451e7d74a98d11e87629ab69493e
-DIST pypy-1.7.tar.bz2 14844629 RMD160 8532c1e7fa320de3a12463c9de10d03969253faa SHA1 b4be3a8dc69cd838a49382867db3c41864b9e8d9 SHA256 3236b0870237e2ed8f3af5f899183a5c71d4c8d7ff1163a3352d6ea5b172596a
 DIST pypy-1.8.tar.bz2 14927806 RMD160 70fe569b466357ee64685c8ce15278d24862c711 SHA1 4ff684619671d6076879eff88343184d7656c699 SHA256 ac98ad6d884207f8325ff4c783104ebea57a3fcddfef32abcdf97fd4307b6287
-EBUILD pypy-1.7-r2.ebuild 3003 RMD160 99ac84375d19a199537585de94e0d9e817ca7b95 SHA1 61687cf9059efb58245bb42b034fd7eacd5b70cf SHA256 5c17e89e32acfa9adcb0eeccf97fcae921efa393bcaeeca087b813290615eb49
 EBUILD pypy-1.8-r1.ebuild 3156 RMD160 41bba9d37e47db4788bb3901c04c6cc5f210bdbd SHA1 2aef475bdd408dcd042f2c0fb865750a665963e2 SHA256 b97521f03d18b5a9fb5584dad78bf246e50a8712768b8684b2b8c1b9ba54ac80
-EBUILD pypy-1.8.ebuild 2777 RMD160 65eedffe4df25241193bf14e9c955120c1fb90ef SHA1 8b2d6b63fb267d3a63a9778c6978c1b66d5c8444 SHA256 883affdf948d9f28766dce1b3175274c8696b739924c5f999f81135d2111001e
-MISC ChangeLog 3095 RMD160 8ee6cf291e4ee2a596c44e5d1e2e3c19e85aae27 SHA1 6c93508ea531654f89a7201a89cd5508a005e208 SHA256 d0876ae7055821d3c593929d19bf55112a5870ec74bc15fe895072c9bb3a9623
+MISC ChangeLog 3230 RMD160 ac75c6f71fa323acebd8b27cf9b3f257ad5a204b SHA1 8b0b9825d385c11592ef7bdc721d669edeb5f8c0 SHA256 1cf9ec90590f7f956eee77246183b7a94b8a58b046a3efb30c780c57ee777e04
 MISC metadata.xml 507 RMD160 ebf6143dae73a70cc62880c10dc1f1c3f82cc1dd SHA1 a8bf12cdeebfd1d30a86075b97be027b138435c8 SHA256 b91eb636cbd78badac8a97a95615ff89c33077e0627aa0732394de54f26a018c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9NKdoACgkQC77qH+pIQ6RlqQD+I/wqFGVQLPr/GM/634/ALxzw
-tesd5uDvoydaMd8pGAEBAKhGRQ9i8IQXQjqdiLRZSL64ttwX1fyieueBDjWnl9nU
-=Ub4Z
+iEYEAREKAAYFAk/SKdsACgkQxeMuLWsGW/uc4wCgrpuBYgQjEbqR2UEDLBAI0Wgz
+OoQAnjwwsO8CqUllwB4fAfk3Jz/wOsgt
+=vQ9w
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/files/1.7-patches.patch b/dev-python/pypy/files/1.7-patches.patch
deleted file mode 100644
index a03ca2240c88..000000000000
--- a/dev-python/pypy/files/1.7-patches.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- pypy-pypy-release-1.7/pypy/translator/goal/translate.py.bak	2011-11-29 14:23:55.000000000 +0100
-+++ pypy-pypy-release-1.7/pypy/translator/goal/translate.py	2011-11-29 14:24:16.000000000 +0100
-@@ -255,8 +255,6 @@
-             log.event("batch mode, not calling interactive helpers")
-             return
-         
--        log.event("start debugger...")
--
-         if translateconfig.view:
-             try:
-                 t1 = drv.hint_translator
-@@ -266,8 +264,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,
-                                                        empty_translator=t,
---- pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py.bak	2011-11-29 14:22:29.000000000 +0100
-+++ pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py	2011-11-29 14:22:55.000000000 +0100
-@@ -1694,6 +1694,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',
---- pypy-pypy-release-1.7/pypy/rlib/ropenssl.py.bak	2011-11-29 14:19:10.000000000 +0100
-+++ pypy-pypy-release-1.7/pypy/rlib/ropenssl.py	2011-11-29 14:19:42.000000000 +0100
-@@ -159,6 +159,7 @@
-              lltype.Void)
- 
- 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 --git a/dev-python/pypy/pypy-1.7-r2.ebuild b/dev-python/pypy/pypy-1.7-r2.ebuild
deleted file mode 100644
index 26c119356c6e..000000000000
--- a/dev-python/pypy/pypy-1.7-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.7-r2.ebuild,v 1.5 2012/02/28 19:24:00 floppym Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs check-reqs python versionator
-
-DESCRIPTION="PyPy is a fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV}.tar.bz2 -> ${P}.tar.bz2"
-SLOTVER=$(get_version_component_range 1-2 ${PV})
-
-LICENSE="MIT"
-SLOT="${SLOTVER}"
-PYTHON_ABI="2.7-pypy-${SLOTVER}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 doc examples +jit ncurses sandbox sqlite ssl xml"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-		virtual/libffi
-		virtual/libintl
-		bzip2? ( app-arch/bzip2 )
-		ncurses? ( sys-libs/ncurses )
-		sqlite? ( dev-db/sqlite:3 )
-		ssl? ( dev-libs/openssl )
-		xml? ( dev-libs/expat )"
-DEPEND="${RDEPEND}"
-PDEPEND="app-admin/python-updater"
-
-DOC="README LICENSE"
-
-pkg_pretend() {
-	CHECKREQS_MEMORY="2G"
-	use amd64 && CHECKREQS_MEMORY="4G"
-	check-reqs_pkg_pretend
-}
-
-src_unpack() {
-	default
-	mv pypy-pypy-* "${S}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-patches.patch"
-	epatch "${FILESDIR}/${PV}-scripts-location.patch"
-	epatch "${FILESDIR}/${P}-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	epatch "${FILESDIR}/${P}-distutils-fix_handling_of_executables_and_flags.patch"
-}
-
-src_compile() {
-	local conf
-	if use jit; then
-		conf="-Ojit"
-	else
-		conf="-O2"
-	fi
-	if use sandbox; then
-		conf+=" --sandbox"
-	fi
-
-	conf+=" ./pypy/translator/goal/targetpypystandalone.py"
-	# Avoid linking against libraries disabled by use flags
-	local optional_use=("bzip2" "ncurses" "xml" "ssl")
-	local 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
-
-	local translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py $conf"
-	echo ${_BOLD}"${translate_cmd}"${_NORMAL}
-	${translate_cmd} || die "compile error"
-}
-
-src_install() {
-	local INSPATH="/usr/$(get_libdir)/pypy${SLOT}"
-	insinto ${INSPATH}
-	doins -r include lib_pypy lib-python pypy-c
-	fperms a+x ${INSPATH}/pypy-c
-	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
-
-	if ! use sqlite; then
-		rm -fr "${ED}${INSPATH}/lib-python/2.7/sqlite3"
-		rm -fr "${ED}${INSPATH}/lib-python/modified-2.7/sqlite3"
-		rm -f "${ED}${INSPATH}/lib_pypy/_sqlite3.py"
-	fi
-
-	# Generate Grammar and PatternGrammar pickles.
-	PYTHONPATH="${ED}${INSPATH}/lib_pypy/__extensions__:${ED}${INSPATH}/lib_pypy:${ED}${INSPATH}/lib-python/modified-2.7:${ED}${INSPATH}/lib-python/2.7" "${ED}${INSPATH}/pypy-c" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" || die "Generation of Grammar and PatternGrammar pickles failed"
-}
-
-src_test() {
-	$(PYTHON -2) ./pypy/test_all.py --pypy=./pypy-c lib-python
-}
diff --git a/dev-python/pypy/pypy-1.8.ebuild b/dev-python/pypy/pypy-1.8.ebuild
deleted file mode 100644
index 8217efa3308b..000000000000
--- a/dev-python/pypy/pypy-1.8.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.8.ebuild,v 1.4 2012/02/14 02:16:50 floppym Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs check-reqs python versionator
-
-DESCRIPTION="PyPy is a fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV}.tar.bz2 -> ${P}.tar.bz2"
-SLOTVER=$(get_version_component_range 1-2 ${PV})
-
-LICENSE="MIT"
-SLOT="${SLOTVER}"
-PYTHON_ABI="2.7-pypy-${SLOTVER}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite stackless ssl xml"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
-		virtual/libffi
-		virtual/libintl
-		bzip2? ( app-arch/bzip2 )
-		ncurses? ( sys-libs/ncurses )
-		sqlite? ( dev-db/sqlite:3 )
-		ssl? ( dev-libs/openssl )
-		xml? ( dev-libs/expat )"
-DEPEND="${RDEPEND}"
-PDEPEND="app-admin/python-updater"
-
-DOC="README LICENSE"
-
-pkg_pretend() {
-	CHECKREQS_MEMORY="2G"
-	use amd64 && CHECKREQS_MEMORY="4G"
-	check-reqs_pkg_pretend
-}
-
-src_unpack() {
-	default
-	mv pypy-pypy-* "${S}" || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/1.7-patches.patch"
-	epatch "${FILESDIR}/1.7-scripts-location.patch"
-	epatch "${FILESDIR}/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	epatch "${FILESDIR}/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch"
-}
-
-src_compile() {
-	local conf
-	if use jit; then
-		conf="-Ojit"
-	else
-		conf="-O2"
-	fi
-	if use shadowstack; then
-		conf+=" --gcrootfinder=shadowstack"
-	fi
-	if use sandbox; then
-		conf+=" --sandbox"
-	fi
-	if use stackless; then
-		conf+=" --stackless"
-	fi
-
-	conf+=" ./pypy/translator/goal/targetpypystandalone.py"
-	# Avoid linking against libraries disabled by use flags
-	local optional_use=("bzip2" "ncurses" "xml" "ssl")
-	local 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
-
-	local translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py $conf"
-	echo ${_BOLD}"${translate_cmd}"${_NORMAL}
-	${translate_cmd} || die "compile error"
-}
-
-src_install() {
-	local INSPATH="/usr/$(get_libdir)/pypy${SLOT}"
-	insinto ${INSPATH}
-	doins -r include lib_pypy lib-python pypy-c
-	fperms a+x ${INSPATH}/pypy-c
-	dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
-
-	if ! use sqlite; then
-		rm -fr "${ED}${INSPATH}/lib-python/2.7/sqlite3"
-		rm -fr "${ED}${INSPATH}/lib-python/modified-2.7/sqlite3"
-		rm -f "${ED}${INSPATH}/lib_pypy/_sqlite3.py"
-	fi
-}
-
-src_test() {
-	$(PYTHON -2) ./pypy/test_all.py --pypy=./pypy-c lib-python
-}