dev-binpkg/pypy: Drop old

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

21 files changed, 1 insertions, 3458 deletions

diff --git a/dev-binpkg/pypy/Manifest b/dev-binpkg/pypy/Manifest
index 9e35763..79befee 100644
--- a/dev-binpkg/pypy/Manifest
+++ b/dev-binpkg/pypy/Manifest
@@ -1,18 +1 @@
-DIST pypy-2.6.0-src.tar.bz2 16858400 BLAKE2B 124dde8ae40341647f65995d240468da7b44fce709569080b30b00c2d6104eac4840d7531d81cd43ff9ffe43e25391a20aa9c05009cd06038edcdf3fcd6451b2 SHA512 82a6a44c0c551a1291215394610e5331cf83216b38ac9f1a79a3eab53ba2933b121c3154b58cead814c73a1da1fc95d895324bb0c43e8e0429438b0dea527cc4
-DIST pypy-4.0.0-src.tar.bz2 17244624 BLAKE2B d0b27b30ae5ff7b1deae343d3ea075079f68663941f67a5635b5688a27e4482ed4ced1382b2d91d8d52fc32a9bc0306cc793ae5ceba0a09f9a78430b7aec9b4f SHA512 2bbdc2536a32b0aa28f7b12ec3d879ed28afe984fad38635bc3e1d950a9fe198cfbaf9b554f0fa245e7fd512ec7a76297f05a1d3e17f73fb49e8506561190f5b
-DIST pypy-4.0.1-src.tar.bz2 17172844 BLAKE2B 66ef2543941460d0b267729332cbc4d4b28d3e3f5657bbd6fc48266b971d9655ecac4f36f7e7ce95d4f9c18ebcc75681596e7732136e381c39dbc35dfe7d5339 SHA512 66358cc3fe9ccb402b717379c48731aca8f9f85a1a754a54e3a060113398955b87a3f3048ba731a93be4b49c0f5c7e3bac49dc4523263e1bf4f4b5149d5db5c4
-DIST pypy-5.0.0-src.tar.bz2 17223494 BLAKE2B 72ad0e035f4d5cb7950b62481d044421280889d252e2e920f54a33c802ece20d3a5ef1ad9bdd68243a0c8c78b83a39e4a1c6f2300cf8f40b369dc429e5a97a9f SHA512 2af686cdad13a1083114a03a7361f58c4dd482e3a83a63b43f8d40922a11120383f91deb6f1607510c4bbd22fd8c59dcf1b58406c2e5cf5548a48542e1b20f89
-DIST pypy-5.1.1-src.tar.bz2 17328934 BLAKE2B 4e5fdb2703bcc50ab0a0e122f897c79e5e1b53b2f4e617a3764b492d8c4f38a4dd0f36f85c9320d0283d3583a4e4e8cd16fc5b95f1dd0ad2cba04b734079b0bd SHA512 2d81b62747ac02980c275fe24fff689e93b4b352e6279c55ca570fd76b8477a55f819e81fab4c6ffdb6991f29536c606d75e238d5bbe04518357509020f23ca9
-DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
-DIST pypy2-v5.3.0-src.tar.bz2 17361429 BLAKE2B 8a041c551225ff15011d766ecd62f83f7241f2bbb74033fb2ae380c32721762eebb60e3178c7cb02ad003a31a67d95db1cc0a907caada0618f0eed891877431f SHA512 6387987b93bebf8ca6d820bde6c42c1a7427a778ff01cf93766df34be792cb1a8d927b3e402f90159df75f68aa1c913a28e9d453e3b13b28489cb68670ef121d
-DIST pypy2-v5.3.1-src.tar.bz2 17361760 BLAKE2B 59ba7b95e851332cd235880c47f98701241741c011a7da2c4ca41ea60201adea9114de44845cf5a9129dde397df5cd411f98e5c71ec24519d3e3055f2c9b3f2d SHA512 3138dde3cb1a155e389a2be615601e22f468d2bc77dd219a35b310052fa06f68f80c3ff62fa4d0a9179eae014ace18620d0a076a0528cb155b1c33cc94d6b397
-DIST pypy2-v5.4.0-src.tar.bz2 17414795 BLAKE2B b9d9d953b1eaa37b1d78b18cc7a858b1fe853ca83e7a0ec8345c675fd86ce98b4d36364b3967bd92c821f998e8d185d906b61141129a4b5be1c3cd70316759c1 SHA512 a989393f75ff45d6a8b8b2597c0a208559b3188ffdf65205ad491332f1836a86bbb419a3dfba67f80e5ab8d075aa97f44c63316f805a51d7ce1481e81b461373
-DIST pypy2-v5.4.1-src.tar.bz2 17412285 BLAKE2B f7653d2ec8c9b4bed8447f93ba4de70ef2e5868b9f0b01f403903922a79bfefb653b69b4322fb620e8b4277b73d5b9c6d07a887f95e2ec3dc4ddfff9c2755f27 SHA512 a366457f5d1fc06dfb256256350b5f2e8e107fe9bc587acc291500ae8b03083788128681ebd5ae272a87b5b7c95abda0210ed7b5594e15f8f0a96a9ff4953375
-DIST pypy2-v5.7.1-src.tar.bz2 18940413 BLAKE2B 391af7816e48b481e6c93b55415f391140eadb144f1424834d64a763bf95be51cbb0e270f782c8f3fd373f538fe3b860ed6ebff56366d960b0648d91e94025d2 SHA512 1ad2dddb40c28d2d3e95a9f0730e765d981dee6e2d0664cf1274eb7c1021690a848c3485c846eac8a8b64425b44946b5b2d223058ec4699155a2122ee7d38b75
-DIST pypy2-v5.8.0-src.tar.bz2 19163498 BLAKE2B 377971cf9e9a5ea75966937e9f22fe24d149af28678947d33356333fe67c8295cf07bf2dac3e7b45d265fef6126d8ebb23aee132e3b43d872bd61ec1ddf17a2c SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365
-DIST pypy2-v5.9.0-src.tar.bz2 19175394 BLAKE2B 0d5fa0d013d8cdb9765bf0f535877894d7a3544c19481973f788187251d1bd2ba11f88950430e85c7608ea394cc952ae7dd7275b9843397ab098e153cf96ec7f SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
-DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
-DIST pypy2.7-v7.0.0-src.tar.bz2 19811330 BLAKE2B 38089896934d79d2b3f5813cc9dae23b0534d9d312871b22336a277d5a15b82d748f66f896558cfdb45a23004944a648436e89ae36fadc107930e7b99963e12b SHA512 7fb5682ee4226af51008f50a81c922e44c231410fe36b7656efa20f22c855ba30a01bc96ee897b4c7a02941d37a405c922b09855977313878e34aaad6bf023dc
-DIST pypy2.7-v7.1.0-src.tar.bz2 20032490 BLAKE2B e916d63d7915959c87830509630d8b2ab993d012d314e88c7cc84bed4c595957c3fc575f7b57fac7c24aaf1492797ca43b146e457357b6e73d9772724461de66 SHA512 fa7c1a6669686dbd9c0da627dc2a06ad696f20274218af9602f91d73f3ebe0ede380c6e1a50534f53dee8f075eaef5a403c7c5b5bdbfff25e679ba30522391bb
-DIST pypy2.7-v7.1.1-src.tar.bz2 20027876 BLAKE2B a411d7312ed3b9be9297e7ff4cc569530529272156117ca037bbe29ad477e7ce3b8903d13c6a5a35e9867a8ccbfaa418061a7b37317b4b713508c429a41ffe9a SHA512 f998931ecf4f9aeee24f0fed95589716175971816c00e50bc53de6de0cfe2a8537b89c1aee636d15faecf91df8c29943295485686185f5247a3e0913fa514f48
 DIST pypy2.7-v7.2.0-src.tar.bz2 20219532 BLAKE2B 225e2cebdfa3ceb310f2a047b1d9e1d375b181c10707822890f39fc0a5ec9e6ddd7a8cf6e073074067960b766a0a813294042513a08b8e7e02b011f612e17917 SHA512 8f724490f9fa06686c8e25ddd3592b260bbffae460395de4c7d29d983780ce9b8925fa87434aac6446aac2034381cc1a13074faf252f5d1ac466a252f219f1ae
diff --git a/dev-binpkg/pypy/files/2.5.0-shared-lib.patch b/dev-binpkg/pypy/files/2.5.0-shared-lib.patch
deleted file mode 100644
index b5c877b..0000000
--- a/dev-binpkg/pypy/files/2.5.0-shared-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur pypy-2.5.0-src.orig/rpython/translator/platform/posix.py pypy-2.5.0-src/rpython/translator/platform/posix.py
---- a/rpython/translator/platform/posix.py	2015-02-03 05:12:49.000000000 +0800
-+++ b/rpython/translator/platform/posix.py	2015-03-22 07:36:01.420116684 +0800
-@@ -183,7 +183,7 @@
-                    'int main(int argc, char* argv[]) '
-                    '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
-             m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
--                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)')
-+                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@')
- 
-         return m
- 
diff --git a/dev-binpkg/pypy/files/5.7.1-kill-flto.patch b/dev-binpkg/pypy/files/5.7.1-kill-flto.patch
deleted file mode 100644
index 92395bd..0000000
--- a/dev-binpkg/pypy/files/5.7.1-kill-flto.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 261f9280d9736965a8626c2d6a6fadd4254b2b89 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 25 Apr 2017 17:03:46 +0200
-Subject: [PATCH] Kill -flto
-
----
- rpython/translator/platform/posix.py | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/rpython/translator/platform/posix.py b/rpython/translator/platform/posix.py
-index a8d4768..20a2934 100644
---- a/rpython/translator/platform/posix.py
-+++ b/rpython/translator/platform/posix.py
-@@ -130,10 +130,6 @@ class BasePosix(Platform):
-         else:
-             cflags = tuple(self.cflags) + tuple(self.standalone_only)
- 
--        # xxx check which compilers accept this option or not
--        if not config or config.translation.gcrootfinder != 'asmgcc':
--            cflags = ('-flto',) + cflags
--
-         m = GnuMakefile(path)
-         m.exe_name = path.join(exe_name.basename)
-         m.eci = eci
--- 
-2.12.2
-
diff --git a/dev-binpkg/pypy/metadata.xml b/dev-binpkg/pypy/metadata.xml
index 675ce03..5915221 100644
--- a/dev-binpkg/pypy/metadata.xml
+++ b/dev-binpkg/pypy/metadata.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
 	<use>
 		<flag name="low-memory">Build using PyPy with the engine configured towards low memory footprint. This makes it possible to build PyPy using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened build time. Please note that you will need an extra ~1G of extra RAM or swap since the translation memory (unused at the time) is not freed when the C compiler is spawned.</flag>
 		<flag name="sandbox">Enable sandboxing functionality</flag>
-		<flag name="shadowstack">Use a shadow stack for finding GC roots</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-binpkg/pypy/pypy-2.6.0.ebuild b/dev-binpkg/pypy/pypy-2.6.0.ebuild
deleted file mode 100644
index 82aaf94..0000000
--- a/dev-binpkg/pypy/pypy-2.6.0.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.6.0.ebuild,v 1.1 2015/06/04 18:46:39 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-CPY_PATCHSET_VERSION="2.7.10-0"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://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 +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	dev-libs/openssl:0=[-bindist]
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${P}-src"
-
-pkg_pretend() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	pkg_pretend
-
-	if python_is_installed pypy; then
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-			einfo "Using already-installed PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-		fi
-	fi
-
-	python-any-r1_pkg_setup
-
-	local cpu
-	if use amd64; then
-		# common denominator between Intel & AMD
-		cpu='x86-64'
-	elif use x86; then
-		if use cpu_flags_x86_sse2; then
-			# lowest with SSE2
-			cpu='pentium-m'
-		else
-			# lowest with SSE, compat. with athlon-xp
-			# TODO: do we want to support something older?
-			cpu='pentium3'
-		fi
-	else
-		die "Unsupported arch ${ARCH}"
-	fi
-
-	export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-	export CXXFLAGS=${CFLAGS}
-
-	elog "CFLAGS: ${CFLAGS}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-}
-
-src_install() {
-	local flags=( bzip2 jit ncurses sandbox shadowstack )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-4.0.0.ebuild b/dev-binpkg/pypy/pypy-4.0.0.ebuild
deleted file mode 100644
index 82aaf94..0000000
--- a/dev-binpkg/pypy/pypy-4.0.0.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.6.0.ebuild,v 1.1 2015/06/04 18:46:39 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-CPY_PATCHSET_VERSION="2.7.10-0"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://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 +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	dev-libs/openssl:0=[-bindist]
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${P}-src"
-
-pkg_pretend() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	pkg_pretend
-
-	if python_is_installed pypy; then
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-			einfo "Using already-installed PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-		fi
-	fi
-
-	python-any-r1_pkg_setup
-
-	local cpu
-	if use amd64; then
-		# common denominator between Intel & AMD
-		cpu='x86-64'
-	elif use x86; then
-		if use cpu_flags_x86_sse2; then
-			# lowest with SSE2
-			cpu='pentium-m'
-		else
-			# lowest with SSE, compat. with athlon-xp
-			# TODO: do we want to support something older?
-			cpu='pentium3'
-		fi
-	else
-		die "Unsupported arch ${ARCH}"
-	fi
-
-	export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-	export CXXFLAGS=${CFLAGS}
-
-	elog "CFLAGS: ${CFLAGS}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-}
-
-src_install() {
-	local flags=( bzip2 jit ncurses sandbox shadowstack )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-4.0.1.ebuild b/dev-binpkg/pypy/pypy-4.0.1.ebuild
deleted file mode 100644
index 82aaf94..0000000
--- a/dev-binpkg/pypy/pypy-4.0.1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.6.0.ebuild,v 1.1 2015/06/04 18:46:39 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-CPY_PATCHSET_VERSION="2.7.10-0"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://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 +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	dev-libs/openssl:0=[-bindist]
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${P}-src"
-
-pkg_pretend() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	pkg_pretend
-
-	if python_is_installed pypy; then
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-			einfo "Using already-installed PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-		fi
-	fi
-
-	python-any-r1_pkg_setup
-
-	local cpu
-	if use amd64; then
-		# common denominator between Intel & AMD
-		cpu='x86-64'
-	elif use x86; then
-		if use cpu_flags_x86_sse2; then
-			# lowest with SSE2
-			cpu='pentium-m'
-		else
-			# lowest with SSE, compat. with athlon-xp
-			# TODO: do we want to support something older?
-			cpu='pentium3'
-		fi
-	else
-		die "Unsupported arch ${ARCH}"
-	fi
-
-	export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-	export CXXFLAGS=${CFLAGS}
-
-	elog "CFLAGS: ${CFLAGS}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-}
-
-src_install() {
-	local flags=( bzip2 jit ncurses sandbox shadowstack )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-5.0.0.ebuild b/dev-binpkg/pypy/pypy-5.0.0.ebuild
deleted file mode 100644
index 82aaf94..0000000
--- a/dev-binpkg/pypy/pypy-5.0.0.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.6.0.ebuild,v 1.1 2015/06/04 18:46:39 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-CPY_PATCHSET_VERSION="2.7.10-0"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://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 +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	dev-libs/openssl:0=[-bindist]
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${P}-src"
-
-pkg_pretend() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	pkg_pretend
-
-	if python_is_installed pypy; then
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-			einfo "Using already-installed PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-		fi
-	fi
-
-	python-any-r1_pkg_setup
-
-	local cpu
-	if use amd64; then
-		# common denominator between Intel & AMD
-		cpu='x86-64'
-	elif use x86; then
-		if use cpu_flags_x86_sse2; then
-			# lowest with SSE2
-			cpu='pentium-m'
-		else
-			# lowest with SSE, compat. with athlon-xp
-			# TODO: do we want to support something older?
-			cpu='pentium3'
-		fi
-	else
-		die "Unsupported arch ${ARCH}"
-	fi
-
-	export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-	export CXXFLAGS=${CFLAGS}
-
-	elog "CFLAGS: ${CFLAGS}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-}
-
-src_install() {
-	local flags=( bzip2 jit ncurses sandbox shadowstack )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-5.1.1.ebuild b/dev-binpkg/pypy/pypy-5.1.1.ebuild
deleted file mode 100644
index a45d69e..0000000
--- a/dev-binpkg/pypy/pypy-5.1.1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://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 +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	dev-libs/openssl:0=[-bindist]
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${P}-src"
-
-pkg_pretend() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	pkg_pretend
-
-	if python_is_installed pypy; then
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-			einfo "Using already-installed PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-		fi
-	fi
-
-	python-any-r1_pkg_setup
-
-	local cpu
-	if use amd64; then
-		# common denominator between Intel & AMD
-		cpu='x86-64'
-	elif use x86; then
-		if use cpu_flags_x86_sse2; then
-			# lowest with SSE2
-			cpu='pentium-m'
-		else
-			# lowest with SSE, compat. with athlon-xp
-			# TODO: do we want to support something older?
-			cpu='pentium3'
-		fi
-	else
-		die "Unsupported arch ${ARCH}"
-	fi
-
-	export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-	export CXXFLAGS=${CFLAGS}
-
-	elog "CFLAGS: ${CFLAGS}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-}
-
-src_install() {
-	local flags=( bzip2 jit ncurses sandbox shadowstack )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-5.10.0.ebuild b/dev-binpkg/pypy/pypy-5.10.0.ebuild
deleted file mode 100644
index 0425266..0000000
--- a/dev-binpkg/pypy/pypy-5.10.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.13-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit libressl low-memory ncurses sandbox cpu_flags_x86_sse2 test"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		local cpu
-		if use amd64; then
-			# common denominator between Intel & AMD
-			cpu='x86-64'
-		elif use x86; then
-			if use cpu_flags_x86_sse2; then
-				# lowest with SSE2
-				cpu='pentium-m'
-			else
-				# lowest with SSE, compat. with athlon-xp
-				# TODO: do we want to support something older?
-				cpu='pentium3'
-			fi
-		else
-			die "Unsupported arch ${ARCH}"
-		fi
-
-		export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-		export CXXFLAGS=${CFLAGS}
-
-		elog "CFLAGS: ${CFLAGS}"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	eapply_user
-}
-
-src_configure() {
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_install() {
-	local flags=( bzip2 jit libressl ncurses sandbox )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-5.3.0.ebuild b/dev-binpkg/pypy/pypy-5.3.0.ebuild
deleted file mode 100644
index 63dc8fe..0000000
--- a/dev-binpkg/pypy/pypy-5.3.0.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	dev-libs/openssl:0=[-bindist]
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	pkg_pretend
-
-	if python_is_installed pypy; then
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-			einfo "Using already-installed PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-		fi
-	fi
-
-	python-any-r1_pkg_setup
-
-	local cpu
-	if use amd64; then
-		# common denominator between Intel & AMD
-		cpu='x86-64'
-	elif use x86; then
-		if use cpu_flags_x86_sse2; then
-			# lowest with SSE2
-			cpu='pentium-m'
-		else
-			# lowest with SSE, compat. with athlon-xp
-			# TODO: do we want to support something older?
-			cpu='pentium3'
-		fi
-	else
-		die "Unsupported arch ${ARCH}"
-	fi
-
-	export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-	export CXXFLAGS=${CFLAGS}
-
-	elog "CFLAGS: ${CFLAGS}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-}
-
-src_install() {
-	local flags=( bzip2 jit ncurses sandbox shadowstack )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-5.3.1.ebuild b/dev-binpkg/pypy/pypy-5.3.1.ebuild
deleted file mode 100644
index 63dc8fe..0000000
--- a/dev-binpkg/pypy/pypy-5.3.1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	dev-libs/openssl:0=[-bindist]
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	pkg_pretend
-
-	if python_is_installed pypy; then
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-			einfo "Using already-installed PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-		fi
-	fi
-
-	python-any-r1_pkg_setup
-
-	local cpu
-	if use amd64; then
-		# common denominator between Intel & AMD
-		cpu='x86-64'
-	elif use x86; then
-		if use cpu_flags_x86_sse2; then
-			# lowest with SSE2
-			cpu='pentium-m'
-		else
-			# lowest with SSE, compat. with athlon-xp
-			# TODO: do we want to support something older?
-			cpu='pentium3'
-		fi
-	else
-		die "Unsupported arch ${ARCH}"
-	fi
-
-	export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-	export CXXFLAGS=${CFLAGS}
-
-	elog "CFLAGS: ${CFLAGS}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-}
-
-src_install() {
-	local flags=( bzip2 jit ncurses sandbox shadowstack )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-5.4.0.ebuild b/dev-binpkg/pypy/pypy-5.4.0.ebuild
deleted file mode 100644
index 63dc8fe..0000000
--- a/dev-binpkg/pypy/pypy-5.4.0.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	dev-libs/openssl:0=[-bindist]
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	pkg_pretend
-
-	if python_is_installed pypy; then
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-			einfo "Using already-installed PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-		fi
-	fi
-
-	python-any-r1_pkg_setup
-
-	local cpu
-	if use amd64; then
-		# common denominator between Intel & AMD
-		cpu='x86-64'
-	elif use x86; then
-		if use cpu_flags_x86_sse2; then
-			# lowest with SSE2
-			cpu='pentium-m'
-		else
-			# lowest with SSE, compat. with athlon-xp
-			# TODO: do we want to support something older?
-			cpu='pentium3'
-		fi
-	else
-		die "Unsupported arch ${ARCH}"
-	fi
-
-	export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-	export CXXFLAGS=${CFLAGS}
-
-	elog "CFLAGS: ${CFLAGS}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-}
-
-src_install() {
-	local flags=( bzip2 jit ncurses sandbox shadowstack )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-5.4.1.ebuild b/dev-binpkg/pypy/pypy-5.4.1.ebuild
deleted file mode 100644
index 63dc8fe..0000000
--- a/dev-binpkg/pypy/pypy-5.4.1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	dev-libs/openssl:0=[-bindist]
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if use low-memory; then
-		if ! python_is_installed pypy; then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy[low-memory]."
-			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	pkg_pretend
-
-	if python_is_installed pypy; then
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-			einfo "Using already-installed PyPy to perform the translation."
-			local EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-		fi
-	fi
-
-	python-any-r1_pkg_setup
-
-	local cpu
-	if use amd64; then
-		# common denominator between Intel & AMD
-		cpu='x86-64'
-	elif use x86; then
-		if use cpu_flags_x86_sse2; then
-			# lowest with SSE2
-			cpu='pentium-m'
-		else
-			# lowest with SSE, compat. with athlon-xp
-			# TODO: do we want to support something older?
-			cpu='pentium3'
-		fi
-	else
-		die "Unsupported arch ${ARCH}"
-	fi
-
-	export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-	export CXXFLAGS=${CFLAGS}
-
-	elog "CFLAGS: ${CFLAGS}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "compile error"
-
-	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-}
-
-src_install() {
-	local flags=( bzip2 jit ncurses sandbox shadowstack )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-5.7.1.ebuild b/dev-binpkg/pypy/pypy-5.7.1.ebuild
deleted file mode 100644
index 8f5994b..0000000
--- a/dev-binpkg/pypy/pypy-5.7.1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.13-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses sandbox cpu_flags_x86_sse2 test"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	dev-libs/openssl:0=[-bindist]
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		local cpu
-		if use amd64; then
-			# common denominator between Intel & AMD
-			cpu='x86-64'
-		elif use x86; then
-			if use cpu_flags_x86_sse2; then
-				# lowest with SSE2
-				cpu='pentium-m'
-			else
-				# lowest with SSE, compat. with athlon-xp
-				# TODO: do we want to support something older?
-				cpu='pentium3'
-			fi
-		else
-			die "Unsupported arch ${ARCH}"
-		fi
-
-		export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-		export CXXFLAGS=${CFLAGS}
-
-		elog "CFLAGS: ${CFLAGS}"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-	# disarm implicit -flto
-	eapply "${FILESDIR}"/5.7.1-kill-flto.patch
-
-	eapply_user
-}
-
-src_configure() {
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_install() {
-	local flags=( bzip2 jit ncurses sandbox )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-5.8.0.ebuild b/dev-binpkg/pypy/pypy-5.8.0.ebuild
deleted file mode 100644
index 0c66185..0000000
--- a/dev-binpkg/pypy/pypy-5.8.0.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.13-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses sandbox cpu_flags_x86_sse2 test"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	dev-libs/openssl:0=[-bindist]
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		local cpu
-		if use amd64; then
-			# common denominator between Intel & AMD
-			cpu='x86-64'
-		elif use x86; then
-			if use cpu_flags_x86_sse2; then
-				# lowest with SSE2
-				cpu='pentium-m'
-			else
-				# lowest with SSE, compat. with athlon-xp
-				# TODO: do we want to support something older?
-				cpu='pentium3'
-			fi
-		else
-			die "Unsupported arch ${ARCH}"
-		fi
-
-		export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-		export CXXFLAGS=${CFLAGS}
-
-		elog "CFLAGS: ${CFLAGS}"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
-
-	eapply_user
-}
-
-src_configure() {
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_install() {
-	local flags=( bzip2 jit ncurses sandbox )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-5.9.0.ebuild b/dev-binpkg/pypy/pypy-5.9.0.ebuild
deleted file mode 100644
index 0425266..0000000
--- a/dev-binpkg/pypy/pypy-5.9.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.13-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit libressl low-memory ncurses sandbox cpu_flags_x86_sse2 test"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		local cpu
-		if use amd64; then
-			# common denominator between Intel & AMD
-			cpu='x86-64'
-		elif use x86; then
-			if use cpu_flags_x86_sse2; then
-				# lowest with SSE2
-				cpu='pentium-m'
-			else
-				# lowest with SSE, compat. with athlon-xp
-				# TODO: do we want to support something older?
-				cpu='pentium3'
-			fi
-		else
-			die "Unsupported arch ${ARCH}"
-		fi
-
-		export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-		export CXXFLAGS=${CFLAGS}
-
-		elog "CFLAGS: ${CFLAGS}"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	eapply_user
-}
-
-src_configure() {
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_install() {
-	local flags=( bzip2 jit libressl ncurses sandbox )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-6.0.0.ebuild b/dev-binpkg/pypy/pypy-6.0.0.ebuild
deleted file mode 100644
index 0425266..0000000
--- a/dev-binpkg/pypy/pypy-6.0.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.13-0"
-MY_P=pypy2-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit libressl low-memory ncurses sandbox cpu_flags_x86_sse2 test"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		local cpu
-		if use amd64; then
-			# common denominator between Intel & AMD
-			cpu='x86-64'
-		elif use x86; then
-			if use cpu_flags_x86_sse2; then
-				# lowest with SSE2
-				cpu='pentium-m'
-			else
-				# lowest with SSE, compat. with athlon-xp
-				# TODO: do we want to support something older?
-				cpu='pentium3'
-			fi
-		else
-			die "Unsupported arch ${ARCH}"
-		fi
-
-		export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-		export CXXFLAGS=${CFLAGS}
-
-		elog "CFLAGS: ${CFLAGS}"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	eapply_user
-}
-
-src_configure() {
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_install() {
-	local flags=( bzip2 jit libressl ncurses sandbox )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-7.0.0.ebuild b/dev-binpkg/pypy/pypy-7.0.0.ebuild
deleted file mode 100644
index 1d8d127..0000000
--- a/dev-binpkg/pypy/pypy-7.0.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit libressl low-memory ncurses sandbox cpu_flags_x86_sse2 test"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		local cpu
-		if use amd64; then
-			# common denominator between Intel & AMD
-			cpu='x86-64'
-		elif use x86; then
-			if use cpu_flags_x86_sse2; then
-				# lowest with SSE2
-				cpu='pentium-m'
-			else
-				# lowest with SSE, compat. with athlon-xp
-				# TODO: do we want to support something older?
-				cpu='pentium3'
-			fi
-		else
-			die "Unsupported arch ${ARCH}"
-		fi
-
-		export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-		export CXXFLAGS=${CFLAGS}
-
-		elog "CFLAGS: ${CFLAGS}"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	eapply_user
-}
-
-src_configure() {
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_install() {
-	local flags=( bzip2 jit libressl ncurses sandbox )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-7.1.0.ebuild b/dev-binpkg/pypy/pypy-7.1.0.ebuild
deleted file mode 100644
index 1d8d127..0000000
--- a/dev-binpkg/pypy/pypy-7.1.0.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit libressl low-memory ncurses sandbox cpu_flags_x86_sse2 test"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		local cpu
-		if use amd64; then
-			# common denominator between Intel & AMD
-			cpu='x86-64'
-		elif use x86; then
-			if use cpu_flags_x86_sse2; then
-				# lowest with SSE2
-				cpu='pentium-m'
-			else
-				# lowest with SSE, compat. with athlon-xp
-				# TODO: do we want to support something older?
-				cpu='pentium3'
-			fi
-		else
-			die "Unsupported arch ${ARCH}"
-		fi
-
-		export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-		export CXXFLAGS=${CFLAGS}
-
-		elog "CFLAGS: ${CFLAGS}"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	eapply_user
-}
-
-src_configure() {
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_install() {
-	local flags=( bzip2 jit libressl ncurses sandbox )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}
diff --git a/dev-binpkg/pypy/pypy-7.1.1.ebuild b/dev-binpkg/pypy/pypy-7.1.1.ebuild
deleted file mode 100644
index 1d8d127..0000000
--- a/dev-binpkg/pypy/pypy-7.1.1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-CPY_PATCHSET_VERSION="2.7.15"
-MY_P=pypy2.7-v${PV}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-# pypy 7.0.0: install directory changed to 'pypy2.7'
-SLOT="0/41-py27"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit libressl low-memory ncurses sandbox cpu_flags_x86_sse2 test"
-
-DEPEND=">=sys-libs/zlib-1.1.3:0=
-	virtual/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	app-arch/lzip
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use low-memory; then
-			if ! python_is_installed pypy; then
-				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
-				eerror
-				eerror "  $ emerge -1v dev-python/pypy-bin"
-				eerror
-				eerror "before attempting to build dev-python/pypy[low-memory]."
-				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
-			fi
-
-			CHECKREQS_MEMORY="1750M"
-			use amd64 && CHECKREQS_MEMORY="3500M"
-		else
-			CHECKREQS_MEMORY="3G"
-			use amd64 && CHECKREQS_MEMORY="6G"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		pkg_pretend
-
-		if python_is_installed pypy; then
-			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
-				einfo "Using already-installed PyPy to perform the translation."
-				local EPYTHON=pypy
-			else
-				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-				einfo "recommends using PyPy for that. If you wish to do so, please unset"
-				einfo "the EPYTHON variable."
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		local cpu
-		if use amd64; then
-			# common denominator between Intel & AMD
-			cpu='x86-64'
-		elif use x86; then
-			if use cpu_flags_x86_sse2; then
-				# lowest with SSE2
-				cpu='pentium-m'
-			else
-				# lowest with SSE, compat. with athlon-xp
-				# TODO: do we want to support something older?
-				cpu='pentium3'
-			fi
-		else
-			die "Unsupported arch ${ARCH}"
-		fi
-
-		export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
-		export CXXFLAGS=${CFLAGS}
-
-		elog "CFLAGS: ${CFLAGS}"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
-
-	eapply_user
-}
-
-src_configure() {
-	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 cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--shared
-		$(usex jit -Ojit -O2)
-		$(usex sandbox --sandbox '')
-
-		${jit_backend}
-
-		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
-
-	local interp=( "${PYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${PYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-
-	# copy back to make sys.prefix happy
-	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
-	pax-mark m pypy-c libpypy-c.so
-}
-
-src_install() {
-	local flags=( bzip2 jit libressl ncurses sandbox )
-	use x86 && flags+=( cpu_flags_x86_sse2 )
-	local f suffix="-${ARCH}"
-
-	for f in ${flags[@]}; do
-		use ${f} && suffix+="+${f#cpu_flags_x86_}"
-	done
-
-	local BIN_P=pypy-bin-${PV}
-
-	einfo "Zipping PyPy ..."
-	mkdir "${BIN_P}${suffix}"{,/include} || die
-	mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
-	mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
-	chmod +x "${BIN_P}${suffix}"/pypy-c || die
-
-	tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
-	lzip -v9 "${BIN_P}${suffix}.tar" || die
-}
-
-# Yup, very hacky.
-pkg_preinst() {
-	# integrity check.
-	[[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
-	mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-	mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
-}