dev-python/pypy{,-bin}, virtual/pypy: Remove the 2.3.1 version

Package-Manager: portage-2.2.20

diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index ea0f28bd8ea50d35fea7ca6ba23dfc9b881dba01..14abab2af9a007b00c59434470bef3d29be7fa76 100644 (file)
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,14 +1,6 @@
-DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 SHA512 86aab86c5f413cdd6a56680915605de5c1416255b43a8dce1b4dcf8f1febdb3275076a4a9c7de30002387d59e4171a52da2528436eb205d8d947de7edd049c65 WHIRLPOOL c78d41240f1803d9461f797fd0ef647a40a6990a4e3a504e80a0eaaf460d052bb60fe6240cacdb3ee8737500c9c7f418b1d55c619d01ac7b73aace3d82157aa6
 DIST pypy-2.4.0-src.tar.bz2 15495214 SHA256 38810007aee4885ca0703b566db6594dd7649adaaa287df7a1012f10e067740f SHA512 91b41ed80a6ff0d7b2b134a7802f098de35ffd2068dc3e477d27b0bc821c6d329eb8bcad4db4a5ff9ff429830d4abfbeb435a2a2d2d9bbc2c36f2d21af0b2e0c WHIRLPOOL affb14b805b2dcb8b579dd421bfb8276e80d3b31cea41bf57ad5dd9260e2e27d838b0303e4a3af5ca38b0b4f08ac88b142d6f1db20753bec6f8cbfdfc482099b
 DIST pypy-2.5.1-src.tar.bz2 16740876 SHA256 ddb3a580b1ee99c5a699172d74be91c36dda9a38946d4731d8c6a63120a3ba2a SHA512 ac4cab47566d7d4e1a293a680e0dffa301c99a8329c2e68f645f186c0266cbe8f045a03e392c0cc2112a16178037cd978b7867ad073bf5dd957dd19f4c818067 WHIRLPOOL 6f16c4090780081dfe1d4642186262c66d4ac1a4b3b8311e573bfa6029eb7aac0483b3e48cad5ce03879391a4e316c0186d33fac5e86d0024ff20cc6d4dc0dd3
 DIST pypy-2.6.0-src.tar.bz2 16858400 SHA256 9bf353f22d25e97a85a6d3766619966055edea1ea1b2218445d683a8ad0399d9 SHA512 82a6a44c0c551a1291215394610e5331cf83216b38ac9f1a79a3eab53ba2933b121c3154b58cead814c73a1da1fc95d895324bb0c43e8e0429438b0dea527cc4 WHIRLPOOL e536ff5d3b393c6834fd721f383318b5dcef79046f475b0f1fe737c67c56e8769cabc0a35f553da5dc475a255c5711de01bd6d42e541cabbab3b9e30f20c9a5c
-DIST pypy-bin-2.3.1-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10724632 SHA256 e897fce8057d6ffd8a8f66ddd3736d82c4edae9e30bf0622b5695c083a5f249d SHA512 b3b9ccb63bf2922c734874d745a40c49d5af1e9d9a3a1188c31040fef20faf4fdc00ac1be90ed35848e09bf86dfe5552a720b7c5c4d845777fc85479b515dac6 WHIRLPOOL 583864f5923dc0e0ee59e2397d1ed0f7ecd027605470bb2462f70b40338167f932a235fc40bf0b7349d9facdb7b1a07d86ff46ccc296acc3bb0f21cf7f8709e9
-DIST pypy-bin-2.3.1-r1-amd64+bzip2+jit+ncurses.tar.xz 12234132 SHA256 2169569b4f85869607d4ba7fa57852f954815a9bbb344da4fa842fbc59e4081a SHA512 7484fa22d79dfb1970c926fa27579184f3a38548d8072c49f239f31a8dc5549786776c27c0aa28583736f144e16ea0edb6fb8be81c0e394af783c6916e775cc1 WHIRLPOOL 3b1124526531cbf86e503933e8294ad7d11cb0993c1d103c59ced46830323e7e7c540194a13880d46b730e7b6498b1b48a1a902766948d28379ccf1020f05f35
-DIST pypy-bin-2.3.1-r1-amd64+bzip2+ncurses.tar.xz 6893836 SHA256 e547e1c5674e53e955373f44ab2ef7ef81f0f3f27240070e634c72b666428456 SHA512 5cb35f6a88aea9e92a8bbbdd873235e8b0b5bcce52d749dd80f68ddb7127eae27122ece74e13c4a2360a0dd65449fa7207a5279f0195732946f7ce8f8aa54142 WHIRLPOOL 4eaa864a456fc29a3731801901f93b62b559eb1bd5867f790840f8f8de1c98fa63bc17bd3dec0f9de82d8f639c2ecf8d3831555503c0089a727ff820c525b24a
-DIST pypy-bin-2.3.1-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz 9114380 SHA256 9e30512444e889236d2bf762a2378da4a79e9b7c055e525a786380fa6fe391c4 SHA512 1175552bd4abde9bc71ef212c3f817f12e5c1815afe02b43d2834e2ae1cdc358d90701f8db667feabdd13009a955a12fabbe88fa441c12cc02fba4757c84056d WHIRLPOOL db927c10627fade821891fda8333ebcb3b0ead64df6bb38ec7482a5aaa8eff3a2b3b4ee0734c541431dcc7492f24424f42a54d48dc3bbd2d26d669ada776d626
-DIST pypy-bin-2.3.1-r1-x86+bzip2+jit+ncurses+sse2.tar.xz 10074824 SHA256 1a15019bf2c1bff57833c0061e2074e48222142919d32b5e8349f5fc2d2a7dc9 SHA512 a99e880e08ecb0cb802ad78f4c6b20017710875503a1fb73bc3e8c5a7710bbbe1d2d3f57f129b4e815fb9576a5dd92731eccd485915f9f036a227aeaecc8a270 WHIRLPOOL 193e0b219e7398a4937d092684447d633dfc66dfbff5c174280bed6b0e31d4230c6c9847de6fed0ddebfa96e9e76aa5edffb0899542c0cabfc688ad24b9c24ce
-DIST pypy-bin-2.3.1-r1-x86+bzip2+ncurses+sse2.tar.xz 5996472 SHA256 cefe34845216e5d7f5a51e318c5449aad867987044849e61fda0ce5486e68c5f SHA512 df07645f87d29b75da9f9d2213922562b4059ebad23da43d8d0eecc3e5fb95feef990e76e54c2dd86712a253db41d64a70d464f9ff7d8e1fa72aae648c888b92 WHIRLPOOL d806f691fc0200b9d470e6508c4217203892ccc7f2f34045952ce111b2a8ec2027d14e6030cee22c3681817b8f6d66ada49fdb62b32a583751494fd605b08dc5
-DIST pypy-bin-2.3.1-r1-x86+bzip2+ncurses.tar.xz 6025904 SHA256 e8aa0fa467daca78cb0231339d3267ecc396faf7b7b992b160bb65f76b65ba19 SHA512 291d11f2cf9115601dcec95876975d694cffe6b8d156ef91463d17d0de26b13d9ad0d773fdf4f126a9a24fc5fe41dc254df36a51e0f1dd8c1c5fa81155d128f2 WHIRLPOOL 98a8e68fdfea8be8efdd2445aa449f3d32731eb6ab2727454e4c0474025316ce43dfbd0bb2fab3cff698401994c76444133e95df3590894cc733f97f3f541539
 DIST pypy-bin-2.4.0-amd64+bzip2+jit+ncurses+shadowstack.tar.xz 10238896 SHA256 158ebb6bef9e77c0ea84ade4449717a608f3e2378b18a198a15187f49f240262 SHA512 3baa4387336ee343949ff7a04de236ef6da1446efa9ae565a61abd6d5d3915d54b51d91d4958b8c1ec61d894943804ea1158c0618349fc4c9e52a8956a4afa56 WHIRLPOOL a2803b6f42a35b74761af918be7c33a460bac246fdaba3c1ca34b3dcff6bbe1f68a1a4299123ce167664516b7e29bc8450cdb6be196313657f2178259b3783a6
 DIST pypy-bin-2.4.0-amd64+bzip2+jit+ncurses.tar.xz 11771744 SHA256 4a05b8819486693c83af7cf45092926526f5511615b6d4181f72e11ac240f263 SHA512 d8e5c1c1721935fe73254fc3037176ad3c71d96acd55d8bcd15bc7b317a72261b7e08a6ae28cb62bfb2203f06b13839670b5da3e435cd87c0f65fea259be2732 WHIRLPOOL 496f244487146e1acd34981b3ec4af81590b136b884f0cb698fc35698cadfad1e278ad627563fd643294c49e1ea27f05c180dd05b3f6d2d4079527775ef4ec90
 DIST pypy-bin-2.4.0-amd64+bzip2+ncurses.tar.xz 6596304 SHA256 f2f2fa539ec1f3fd048bd81bb5fa54f260980fe9689c578f134f39ecf00aa027 SHA512 e8603ba08a11c1cbd9d3af824aca1c4ae7b61d46879b398d5d18428bc438c2e0bd0fd9ecd83f100715b635968eee3805db18a42ab62fbc10d8cd0186b6998431 WHIRLPOOL 2758fc778a1f9e5db966aa1e5a47a8da8c1fbb5882aa74ba9709c23e1b3a546c826de8ea4ba83e5baae262a51636d7201445102c97d4c749a98805a46aeac9ba

diff --git a/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild b/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild
deleted file mode 100644 (file)
index 76f4b5e..0000000
--- a/dev-python/pypy-bin/pypy-bin-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-inherit eutils multilib pax-utils python-any-r1 vcs-snapshot versionator
-
-BINHOST="http://pypy.aliceinwire.net/pypy-bin/"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language (binary package)"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://www.bitbucket.org/pypy/pypy/downloads/pypy-${PV}-src.tar.bz2
-       amd64? (
-               jit? ( shadowstack? (
-                       ${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
-                               -> ${P}-r1-amd64+bzip2+jit+ncurses+shadowstack.tar.xz
-               ) )
-               jit? ( !shadowstack? (
-                       ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.xz
-                               -> ${P}-r1-amd64+bzip2+jit+ncurses.tar.xz
-               ) )
-               !jit? ( !shadowstack? (
-                       ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.xz
-                               -> ${P}-r1-amd64+bzip2+ncurses.tar.xz
-               ) )
-       )
-       x86? (
-               cpu_flags_x86_sse2? (
-                       jit? ( shadowstack? (
-                               ${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
-                                       -> ${P}-r1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.xz
-                       ) )
-                       jit? ( !shadowstack? (
-                               ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.xz
-                                       -> ${P}-r1-x86+bzip2+jit+ncurses+sse2.tar.xz
-                       ) )
-                       !jit? ( !shadowstack? (
-                               ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.xz
-                                       -> ${P}-r1-x86+bzip2+ncurses+sse2.tar.xz
-                       ) )
-               )
-               !cpu_flags_x86_sse2? (
-                       !jit? ( !shadowstack? (
-                               ${BINHOST}/${P}-x86+bzip2+ncurses.tar.xz
-                                       -> ${P}-r1-x86+bzip2+ncurses.tar.xz
-                       ) )
-               )
-       )"
-
-# Supported variants
-REQUIRED_USE="!jit? ( !shadowstack )
-       x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )"
-
-LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit shadowstack sqlite cpu_flags_x86_sse2 test tk"
-
-# yep, world would be easier if people started filling subslots...
-RDEPEND="
-       app-arch/bzip2:0
-       dev-libs/expat:0
-       dev-libs/libffi:0
-       dev-libs/openssl:0[-bindist]
-       sys-libs/glibc:2.2
-       sys-libs/ncurses:5/5
-       sys-libs/zlib:0
-       gdbm? ( sys-libs/gdbm:0= )
-       sqlite? ( dev-db/sqlite:3= )
-       tk? (
-               dev-lang/tk:0=
-               dev-tcltk/tix:0=
-       )
-       !dev-python/pypy:0"
-DEPEND="app-arch/xz-utils
-       doc? ( ${PYTHON_DEPS}
-               dev-python/sphinx )
-       test? ( ${RDEPEND} )"
-PDEPEND="app-admin/python-updater"
-
-S=${WORKDIR}/pypy-${PV}-src
-
-pkg_setup() {
-       use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/1.9-scripts-location.patch"
-       epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-       pushd lib-python/2.7 > /dev/null || die
-       epatch "${FILESDIR}/2.3-21_all_distutils_c++.patch"
-       popd > /dev/null || die
-
-       epatch_user
-}
-
-src_compile() {
-       # Tadaam! PyPy compiled!
-       mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
-       mv "${WORKDIR}"/${P}*/include/*.h include/ || die
-       mv pypy/module/cpyext/include/*.h include/ || die
-       mv pypy/module/cpyext/include/numpy include/ || die
-
-       use doc && emake -C pypy/doc/ html
-       #needed even without jit :( also needed in both compile and install phases
-       pax-mark m pypy-c
-}
-
-src_test() {
-       # (unset)
-       local -x PYTHONDONTWRITEBYTECODE
-
-       ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-       einfo "Installing PyPy ..."
-       insinto "/usr/$(get_libdir)/pypy"
-       doins -r include lib_pypy lib-python pypy-c libpypy-c.so
-       fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
-       pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
-       dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-       dosym ../$(get_libdir)/pypy/libpypy-c.so /usr/$(get_libdir)/libpypy-c.so
-       dodoc README.rst
-
-       if ! use gdbm; then
-               rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
-                       "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
-       fi
-       if ! use sqlite; then
-               rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
-                       "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
-                       "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
-       fi
-       if ! use tk; then
-               rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
-                       "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
-                       "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-       fi
-
-       # Install docs
-       use doc && dohtml -r pypy/doc/_build/html/
-
-       einfo "Generating caches and byte-compiling ..."
-
-       python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
-       local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
-       local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
-
-       echo "EPYTHON='${EPYTHON}'" > epython.py
-       python_domodule epython.py
-
-       # Generate Grammar and PatternGrammar pickles.
-       "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-               || die "Generation of Grammar and PatternGrammar pickles failed"
-
-       # ctypes config cache
-       "${PYTHON}" -m ctypes_config_cache.rebuild || die "Failed to rebuild ctypes config cache"
-
-       # Generate cffi cache
-       # Please keep in sync with pypy/tool/release/package.py!
-       "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
-       "${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
-       if use gdbm; then
-               "${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)"
-       fi
-       if use sqlite; then
-               "${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
-       fi
-       if use tk; then
-               "${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)"
-       fi
-
-       # Cleanup temporary objects
-       find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
-       find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
-
-       # compile the installed modules
-       python_optimize "${ED%/}${INSDESTTREE}"
-}

diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index d53afe97fb44fbda352cd0795b23074a89f1ed18..b172095e4f4b82d3a183cb33b47d21c382dcb51d 100644 (file)
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,3 @@
-DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 SHA512 86aab86c5f413cdd6a56680915605de5c1416255b43a8dce1b4dcf8f1febdb3275076a4a9c7de30002387d59e4171a52da2528436eb205d8d947de7edd049c65 WHIRLPOOL c78d41240f1803d9461f797fd0ef647a40a6990a4e3a504e80a0eaaf460d052bb60fe6240cacdb3ee8737500c9c7f418b1d55c619d01ac7b73aace3d82157aa6
 DIST pypy-2.4.0-src.tar.bz2 15495214 SHA256 38810007aee4885ca0703b566db6594dd7649adaaa287df7a1012f10e067740f SHA512 91b41ed80a6ff0d7b2b134a7802f098de35ffd2068dc3e477d27b0bc821c6d329eb8bcad4db4a5ff9ff429830d4abfbeb435a2a2d2d9bbc2c36f2d21af0b2e0c WHIRLPOOL affb14b805b2dcb8b579dd421bfb8276e80d3b31cea41bf57ad5dd9260e2e27d838b0303e4a3af5ca38b0b4f08ac88b142d6f1db20753bec6f8cbfdfc482099b
 DIST pypy-2.5.1-src.tar.bz2 16740876 SHA256 ddb3a580b1ee99c5a699172d74be91c36dda9a38946d4731d8c6a63120a3ba2a SHA512 ac4cab47566d7d4e1a293a680e0dffa301c99a8329c2e68f645f186c0266cbe8f045a03e392c0cc2112a16178037cd978b7867ad073bf5dd957dd19f4c818067 WHIRLPOOL 6f16c4090780081dfe1d4642186262c66d4ac1a4b3b8311e573bfa6029eb7aac0483b3e48cad5ce03879391a4e316c0186d33fac5e86d0024ff20cc6d4dc0dd3
 DIST pypy-2.6.0-src.tar.bz2 16858400 SHA256 9bf353f22d25e97a85a6d3766619966055edea1ea1b2218445d683a8ad0399d9 SHA512 82a6a44c0c551a1291215394610e5331cf83216b38ac9f1a79a3eab53ba2933b121c3154b58cead814c73a1da1fc95d895324bb0c43e8e0429438b0dea527cc4 WHIRLPOOL e536ff5d3b393c6834fd721f383318b5dcef79046f475b0f1fe737c67c56e8769cabc0a35f553da5dc475a255c5711de01bd6d42e541cabbab3b9e30f20c9a5c

diff --git a/dev-python/pypy/pypy-2.3.1-r2.ebuild b/dev-python/pypy/pypy-2.3.1-r2.ebuild
deleted file mode 100644 (file)
index 89bf5fb..0000000
--- a/dev-python/pypy/pypy-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2015 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 vcs-snapshot versionator
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/${PN}/${PN}/get/release-${PV}.tar.bz2 -> ${P}-src.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 tk"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-       virtual/libffi:0=
-       virtual/libintl:0=
-       dev-libs/expat:0=
-       dev-libs/openssl:0=
-       bzip2? ( app-arch/bzip2:0= )
-       gdbm? ( sys-libs/gdbm:0= )
-       ncurses? ( sys-libs/ncurses:5/5 )
-       sqlite? ( dev-db/sqlite:3= )
-       tk? (
-               dev-lang/tk:0=
-               dev-tcltk/tix:0=
-       )
-       !dev-python/pypy-bin:0"
-DEPEND="${RDEPEND}
-       doc? ( dev-python/sphinx )
-       ${PYTHON_DEPS}"
-PDEPEND="app-admin/python-updater"
-
-S="${WORKDIR}/${P}-src"
-
-pkg_pretend() {
-       if use low-memory; then
-               if ! has_version dev-python/pypy && ! has_version dev-python/pypy-bin
-               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
-}
-
-pkg_setup() {
-       local force_pypy
-
-       pkg_pretend
-
-       if has_version dev-python/pypy || has_version dev-python/pypy-bin
-       then
-               if [[ ! ${EPYTHON} ]] || use low-memory; then
-                       einfo "Using already-installed PyPy to perform the translation."
-                       force_pypy=1
-               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
-
-       if [[ ${force_pypy} ]]; then
-               # set manually since python_setup needs virtual/pypy
-               # and we don't force the dep
-               python_export pypy EPYTHON PYTHON
-               python_wrapper_setup
-       else
-               python-any-r1_pkg_setup
-       fi
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/1.9-scripts-location.patch" \
-               "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
-               "${FILESDIR}"/2.3.1-shared-lib.patch    # 517002
-
-       pushd lib-python/2.7 > /dev/null || die
-       epatch "${FILESDIR}/2.3-21_all_distutils_c++.patch"
-       popd > /dev/null || die
-
-       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"
-
-       use doc && emake -C pypy/doc/ html
-       pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
-}
-
-src_test() {
-       # (unset)
-       local -x PYTHONDONTWRITEBYTECODE
-
-       ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
-}
-
-src_install() {
-       einfo "Installing PyPy ..."
-       insinto "/usr/$(get_libdir)/pypy"
-       doins -r include lib_pypy lib-python pypy-c libpypy-c.so
-       fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
-       pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
-       dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
-       dodoc README.rst
-
-       if ! use gdbm; then
-               rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
-                       "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
-       fi
-       if ! use sqlite; then
-               rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
-                       "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
-                       "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
-       fi
-       if ! use tk; then
-               rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
-                       "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
-                       "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-       fi
-
-       # Install docs
-       use doc && dohtml -r pypy/doc/_build/html/
-
-       einfo "Generating caches and byte-compiling ..."
-
-       python_export pypy EPYTHON PYTHON PYTHON_SITEDIR
-       local PYTHON=${ED%/}${INSDESTTREE}/pypy-c
-       local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
-
-       echo "EPYTHON='${EPYTHON}'" > epython.py
-       python_domodule epython.py
-
-       # Generate Grammar and PatternGrammar pickles.
-       "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-               || die "Generation of Grammar and PatternGrammar pickles failed"
-
-       # Generate cffi cache
-       # Please keep in sync with pypy/tool/release/package.py!
-       "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)"
-       "${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)"
-       if use gdbm; then
-               "${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)"
-       fi
-       if use sqlite; then
-               "${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)"
-       fi
-       if use tk; then
-               "${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)"
-       fi
-
-       # Cleanup temporary objects
-       find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
-       find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
-
-       # compile the installed modules
-       python_optimize "${ED%/}${INSDESTTREE}"
-}

diff --git a/virtual/pypy/pypy-2.3.1.ebuild b/virtual/pypy/pypy-2.3.1.ebuild
deleted file mode 100644 (file)
index d7ce6b6..0000000
--- a/virtual/pypy/pypy-2.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="A virtual for PyPy Python implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-       || (
-               >=dev-python/pypy-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-               >=dev-python/pypy-bin-${PV}:${SLOT}[gdbm(-)?,sqlite?,tk?]
-       )"