From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1464913-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id ACF36158003
	for <garchives@archives.gentoo.org>; Wed,  7 Dec 2022 16:00:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 8CF9CE086E;
	Wed,  7 Dec 2022 16:00:04 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 56DE3E086E
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Dec 2022 16:00:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id CADBE340EF8
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Dec 2022 16:00:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 57E7C7D8
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Dec 2022 15:59:59 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1670428792.349fe37ab49217d680b133d4fb4944ccaff63b14.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/pypy/Manifest dev-python/pypy/pypy-7.3.10_rc3.ebuild dev-python/pypy/pypy-7.3.9-r2.ebuild
X-VCS-Directories: dev-python/pypy/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 349fe37ab49217d680b133d4fb4944ccaff63b14
X-VCS-Branch: master
Date: Wed,  7 Dec 2022 15:59:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2554c929-e390-4bac-b1e5-609ee507207f
X-Archives-Hash: 8646df1e31f21d692eea02c75233686f

commit:     349fe37ab49217d680b133d4fb4944ccaff63b14
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 15:55:50 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 15:59:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=349fe37a

dev-python/pypy: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pypy/Manifest               |   4 -
 dev-python/pypy/pypy-7.3.10_rc3.ebuild | 302 ---------------------------------
 dev-python/pypy/pypy-7.3.9-r2.ebuild   | 302 ---------------------------------
 3 files changed, 608 deletions(-)

diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 853c840e83dc..82c1162a336f 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,6 +1,2 @@
 DIST pypy2.7-gentoo-patches-7.3.10.tar.xz 5312 BLAKE2B 3ca6d3a01914ae92d93fbd185705dae6bebfd4869a818f4a8058c9df3ea243fd9f1e5b962351f8d07a9679e8020499e81b7d1114d4f1b7493dc1d34c8c04409e SHA512 6758894f6d66dc99a13471cf373c5a2d2bbf37ac561e8d7c4f57ec2f1a9653cf9859547d9a7a80e7f0f7df16078030a4b1cee69536958176f0261da49493310e
-DIST pypy2.7-gentoo-patches-7.3.10rc3.tar.xz 5324 BLAKE2B 83675b7d2aa0eaace337308e9d818e1d745471a72bd67f269265b06b40a2fb62e26aedd2489ceaf02eb15dd655277dcf8fc3fe280d83d636afb0a69eb2b35795 SHA512 7fdf4fc2f7fdd8accd8af6f8713c6db55510be7a129e608ef0a7c30cd8db74f2711ded41daae3d2d698e394a146996cf699d87147a5d433a2321bcb7682c15b7
-DIST pypy2.7-gentoo-patches-7.3.9.tar.xz 7428 BLAKE2B 0a42e3c04ac0e560d56ce7218db81fa55f74ad45a4a033ccda8c5fba34e3a0b1f06587b5b18e947170cc635bd44e5a7799daeec9319c6a09165a73b32554a4b6 SHA512 3a52d40ccf8d77f3493a763b51e4bf86a808f6478191ed4eeaa4f2c2ce8b75769c3880d07cbc7614d8af5573f3e8edfe694be41626b947f3d06c321cf4f59abd
 DIST pypy2.7-v7.3.10-src.tar.bz2 19865458 BLAKE2B 0ba83b873daf99b20bd38ee63734c7ceb47b6a7e9cb4bdab1ebbd5672767411f0bf926a19a7074cbfc154a8d83e3679c98fe38c5b6e00c1a4a3fab5424b5ba5d SHA512 750427ce03fdc39f8b6df528f5a2b17f33429433f583a7c46a6b9564f7e398616ae61efb635a4bc0a1f8916ca1881bf1f6347a7ea1748c09ae02e4d88315986d
-DIST pypy2.7-v7.3.10rc3-src.tar.bz2 19776339 BLAKE2B a6866a0ff7a7b4bb3e1815fdc741cc95ff7945f6271e0189b6d16d1efc64c72a75a1400c3859a5b8c5f5b176217463a446b3449093572df59e13df15a207828f SHA512 097d57862728197e648cf38380ce4a60d6192bc9f2c0c2cf6840717af0320acd8cf42e344513428be60f60e136d830a0bb5d6295e7909cd7f3a42bac992c780a
-DIST pypy2.7-v7.3.9-src.tar.bz2 23328628 BLAKE2B 50d015439b6a6f15dd24eb4524726a2054f0d8e7ef209b54dc4eb9365b41b333f3dad525422316af3ff19e6ffb5866859db4455e05fc1529a81ce3b6e7c621db SHA512 8d7513d4efe924f2456dd65a45a82dd16171f7962c81ba90f2a168c332cdad78ceffa3ed1af379c09e61082b39d5c2a8385cd77c89b698c47cc75e9df1bb4d2a

diff --git a/dev-python/pypy/pypy-7.3.10_rc3.ebuild b/dev-python/pypy/pypy-7.3.10_rc3.ebuild
deleted file mode 100644
index f72b0b7080fb..000000000000
--- a/dev-python/pypy/pypy-7.3.10_rc3.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils python-utils-r1
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS=""
-IUSE="bzip2 full-stdlib gdbm +jit ncurses sqlite tk"
-RESTRICT="!full-stdlib? ( test )"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
-		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-libs/openssl:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy-bin-7.3.0:0
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy-c - <<-EOF
-			import sysconfig
-			print sysconfig.get_config_var("SOABI")
-		EOF
-	)
-	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	einfo "Generating caches and CFFI modules ..."
-
-	if use full-stdlib; then
-		# Generate Grammar and PatternGrammar pickles.
-		./pypy-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-			import lib2to3.pygram
-			import lib2to3.patcomp
-			lib2to3.patcomp.PatternCompiler()
-		EOF
-
-		# Generate cffi modules
-		# Please keep in sync with pypy/tool/build_cffi_imports.py!
-		cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
-		use gdbm && cffi_targets+=( gdbm )
-		use ncurses && cffi_targets+=( curses )
-		use sqlite && cffi_targets+=( sqlite3 )
-		use tk && cffi_targets+=( tkinter/tklib )
-
-		local t
-		# all modules except tkinter output to .
-		# tkinter outputs to the correct dir ...
-		cd lib_pypy || die
-		for t in "${cffi_targets[@]}"; do
-			# tkinter doesn't work via -m
-			../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-		done
-
-		# Verify that CFFI module list is up-to-date
-		local expected_cksum=2d3acf18
-		local local_cksum=$(
-			../pypy-c - <<-EOF
-				import binascii
-				import json
-				from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-				print("%08x" % (binascii.crc32(json.dumps(x)),))
-			EOF
-		)
-		if [[ ${local_cksum} != ${expected_cksum} ]]; then
-			die "Please verify cffi_targets and update checksum to ${local_cksum}"
-		fi
-
-		# Cleanup temporary objects
-		find -name "_cffi_*.[co]" -delete || die
-		find -type d -empty -delete || die
-	fi
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-
-		# broken by expat-2.4.5
-		--ignore=lib-python/2.7/test/test_minidom.py
-		--ignore=lib-python/2.7/test/test_xml_etree.py
-		--ignore=lib-python/2.7/test/test_xml_etree_c.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	if use full-stdlib; then
-		doins -r include lib_pypy lib-python
-
-		# replace copied headers with symlinks
-		for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
-			dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-		done
-
-		if ! use gdbm; then
-			rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-				"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-		fi
-		if ! use sqlite; then
-			rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-				"${ED}${dest}"/lib_pypy/_sqlite3.py \
-				"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-		fi
-		if ! use tk; then
-			rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-				"${ED}${dest}"/lib_pypy/_tkinter \
-				"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-		fi
-	else
-		# install only the absolutely minimal subset of modules needed
-		# for pypy3 build
-		local lib_py_modules=(
-			# base modules needed to even start pypy (and import site)
-			codecs.py
-			copy_reg.py
-			encodings
-			genericpath.py
-			linecache.py
-			os.py
-			pkgutil.py
-			posixpath.py
-			re.py
-			runpy.py
-			site.py
-			sre_compile.py
-			sre_constants.py
-			sre_parse.py
-			stat.py
-			string.py
-			sysconfig.py
-			traceback.py
-			warnings.py
-			UserDict.py
-
-			# needed for python_optimize
-			compileall.py
-			getopt.py
-			py_compile.py
-			struct.py
-
-			# needed for rpython
-			argparse.py
-			atexit.py
-			base64.py
-			bdb.py
-			bisect.py
-			cmd.py
-			code.py
-			codeop.py
-			collections.py
-			colorsys.py
-			contextlib.py
-			copy.py
-			ctypes
-			dis.py
-			fnmatch.py
-			functools.py
-			gettext.py
-			hashlib.py
-			heapq.py
-			inspect.py
-			io.py
-			json
-			keyword.py
-			locale.py
-			logging
-			new.py
-			opcode.py
-			optparse.py
-			pdb.py
-			pickle.py
-			platform.py
-			pprint.py
-			random.py
-			repr.py
-			shlex.py
-			shutil.py
-			StringIO.py
-			subprocess.py
-			tempfile.py
-			textwrap.py
-			threading.py
-			tokenize.py
-			weakref.py
-			zipfile.py
-		)
-
-		local distutils_modules=(
-			# needed by site
-			__init__.py
-			errors.py
-			sysconfig.py
-			sysconfig_cpython.py
-			sysconfig_pypy.py
-		)
-
-		local lib_pypy_modules=(
-			# needed by site
-			_sysconfigdata.py
-
-			# needed by rpython
-			cffi
-			_ctypes
-			_ffi.py
-			_functools.py
-			_sha.py
-			_sha256.py
-			_sha512.py
-
-			# NB: we're deliberately skipping _hashlib to avoid some deps
-		)
-
-		cd lib-python/2.7 || die
-		insinto "${dest}/lib-python/2.7"
-		doins -r "${lib_py_modules[@]}"
-		cd - >/dev/null || die
-
-		cd lib-python/2.7/distutils || die
-		insinto "${dest}/lib-python/2.7/distutils"
-		doins -r "${distutils_modules[@]}"
-		cd - >/dev/null || die
-
-		cd lib_pypy || die
-		insinto "${dest}/lib_pypy"
-		doins -r "${lib_pypy_modules[@]}"
-		cd - >/dev/null || die
-	fi
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}

diff --git a/dev-python/pypy/pypy-7.3.9-r2.ebuild b/dev-python/pypy/pypy-7.3.9-r2.ebuild
deleted file mode 100644
index 6602b45362f9..000000000000
--- a/dev-python/pypy/pypy-7.3.9-r2.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pax-utils python-utils-r1
-
-PYPY_PV=${PV%_p*}
-MY_P=pypy2.7-v${PYPY_PV/_}
-PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://www.pypy.org/"
-SRC_URI="
-	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 full-stdlib gdbm +jit ncurses sqlite tk"
-RESTRICT="!full-stdlib? ( test )"
-
-RDEPEND="
-	|| (
-		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
-		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
-	)
-	dev-libs/openssl:0=
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy-bin-7.3.0:0
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-	default
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	# verify the subslot
-	local soabi=$(
-		./pypy-c - <<-EOF
-			import sysconfig
-			print sysconfig.get_config_var("SOABI")
-		EOF
-	)
-	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
-
-	einfo "Generating caches and CFFI modules ..."
-
-	if use full-stdlib; then
-		# Generate Grammar and PatternGrammar pickles.
-		./pypy-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
-			import lib2to3.pygram
-			import lib2to3.patcomp
-			lib2to3.patcomp.PatternCompiler()
-		EOF
-
-		# Generate cffi modules
-		# Please keep in sync with pypy/tool/build_cffi_imports.py!
-		cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
-		use gdbm && cffi_targets+=( gdbm )
-		use ncurses && cffi_targets+=( curses )
-		use sqlite && cffi_targets+=( sqlite3 )
-		use tk && cffi_targets+=( tkinter/tklib )
-
-		local t
-		# all modules except tkinter output to .
-		# tkinter outputs to the correct dir ...
-		cd lib_pypy || die
-		for t in "${cffi_targets[@]}"; do
-			# tkinter doesn't work via -m
-			../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-		done
-
-		# Verify that CFFI module list is up-to-date
-		local expected_cksum=2d3acf18
-		local local_cksum=$(
-			../pypy-c - <<-EOF
-				import binascii
-				import json
-				from pypy_tools.build_cffi_imports import cffi_build_scripts as x
-				print("%08x" % (binascii.crc32(json.dumps(x)),))
-			EOF
-		)
-		if [[ ${local_cksum} != ${expected_cksum} ]]; then
-			die "Please verify cffi_targets and update checksum to ${local_cksum}"
-		fi
-
-		# Cleanup temporary objects
-		find -name "_cffi_*.[co]" -delete || die
-		find -type d -empty -delete || die
-	fi
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-
-		# broken by expat-2.4.5
-		--ignore=lib-python/2.7/test/test_minidom.py
-		--ignore=lib-python/2.7/test/test_xml_etree.py
-		--ignore=lib-python/2.7/test/test_xml_etree_c.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	if use full-stdlib; then
-		doins -r include lib_pypy lib-python
-
-		# replace copied headers with symlinks
-		for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
-			dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-		done
-
-		if ! use gdbm; then
-			rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-				"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-		fi
-		if ! use sqlite; then
-			rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-				"${ED}${dest}"/lib_pypy/_sqlite3.py \
-				"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-		fi
-		if ! use tk; then
-			rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-				"${ED}${dest}"/lib_pypy/_tkinter \
-				"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-		fi
-	else
-		# install only the absolutely minimal subset of modules needed
-		# for pypy3 build
-		local lib_py_modules=(
-			# base modules needed to even start pypy (and import site)
-			codecs.py
-			copy_reg.py
-			encodings
-			genericpath.py
-			linecache.py
-			os.py
-			pkgutil.py
-			posixpath.py
-			re.py
-			runpy.py
-			site.py
-			sre_compile.py
-			sre_constants.py
-			sre_parse.py
-			stat.py
-			string.py
-			sysconfig.py
-			traceback.py
-			warnings.py
-			UserDict.py
-
-			# needed for python_optimize
-			compileall.py
-			getopt.py
-			py_compile.py
-			struct.py
-
-			# needed for rpython
-			argparse.py
-			atexit.py
-			base64.py
-			bdb.py
-			bisect.py
-			cmd.py
-			code.py
-			codeop.py
-			collections.py
-			colorsys.py
-			contextlib.py
-			copy.py
-			ctypes
-			dis.py
-			fnmatch.py
-			functools.py
-			gettext.py
-			hashlib.py
-			heapq.py
-			inspect.py
-			io.py
-			json
-			keyword.py
-			locale.py
-			logging
-			new.py
-			opcode.py
-			optparse.py
-			pdb.py
-			pickle.py
-			platform.py
-			pprint.py
-			random.py
-			repr.py
-			shlex.py
-			shutil.py
-			StringIO.py
-			subprocess.py
-			tempfile.py
-			textwrap.py
-			threading.py
-			tokenize.py
-			weakref.py
-			zipfile.py
-		)
-
-		local distutils_modules=(
-			# needed by site
-			__init__.py
-			errors.py
-			sysconfig.py
-			sysconfig_cpython.py
-			sysconfig_pypy.py
-		)
-
-		local lib_pypy_modules=(
-			# needed by site
-			_sysconfigdata.py
-
-			# needed by rpython
-			cffi
-			_ctypes
-			_ffi.py
-			_functools.py
-			_sha.py
-			_sha256.py
-			_sha512.py
-
-			# NB: we're deliberately skipping _hashlib to avoid some deps
-		)
-
-		cd lib-python/2.7 || die
-		insinto "${dest}/lib-python/2.7"
-		doins -r "${lib_py_modules[@]}"
-		cd - >/dev/null || die
-
-		cd lib-python/2.7/distutils || die
-		insinto "${dest}/lib-python/2.7/distutils"
-		doins -r "${distutils_modules[@]}"
-		cd - >/dev/null || die
-
-		cd lib_pypy || die
-		insinto "${dest}/lib_pypy"
-		doins -r "${lib_pypy_modules[@]}"
-		cd - >/dev/null || die
-	fi
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}