summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-02-10 08:23:41 +0000
committerPacho Ramos <pacho@gentoo.org>2013-02-10 08:23:41 +0000
commit59a59bd356f22b0c4b52c1c4bd103750895b7518 (patch)
tree82a0ffad4c8c239f6589efc3220b5a715ffaea5b /dev-python/pypy
parentAdded -CC.patch offered, tested by, and thanks to, Tomoatsu Shimada, Bug #455196 (diff)
downloadhistorical-59a59bd356f22b0c4b52c1c4bd103750895b7518.tar.gz
historical-59a59bd356f22b0c4b52c1c4bd103750895b7518.tar.bz2
historical-59a59bd356f22b0c4b52c1c4bd103750895b7518.zip
Remove masked package
Package-Manager: portage-2.1.11.50/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'dev-python/pypy')
-rw-r--r--dev-python/pypy/ChangeLog8
-rw-r--r--dev-python/pypy/Manifest14
-rw-r--r--dev-python/pypy/files/1.7-scripts-location.patch11
-rw-r--r--dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch10
-rw-r--r--dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch22
-rw-r--r--dev-python/pypy/pypy-1.8-r1.ebuild101
-rw-r--r--dev-python/pypy/pypy-1.8-r2.ebuild115
7 files changed, 11 insertions, 270 deletions
diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 8ea73db99fb6..f5c262bc20f9 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/pypy
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.31 2013/01/02 04:41:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.32 2013/02/10 08:23:32 pacho Exp $
+
+ 10 Feb 2013; Pacho Ramos <pacho@gentoo.org> -files/1.7-scripts-location.patch,
+ -files/1.8-elf-metadata-26a8d3fc57a7.patch,
+ -files/1.8-sext-instructions-02dc2f6160ee.patch, -pypy-1.8-r1.ebuild,
+ -pypy-1.8-r2.ebuild:
+ Remove masked package
02 Jan 2013; Mike Gilbert <floppym@gentoo.org> pypy-2.0_beta1.ebuild:
Add keywords.
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 1f1a38ee0c5c..5df0b4a2c098 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,9 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 1.7-scripts-location.patch 412 SHA256 abc39fbbf69d1d6b478a4a16626950e8e0b607fb05c6e1e1c10618c59fccdda9 SHA512 7decd12518dcc643609bf5c00dc7391e407ca6a5e5e30cc043387ffd234ced27f04c79d6d51766d552a918022469f6b1cbdab4ce1c62220339eb09d583536b59 WHIRLPOOL 04fe1474e053c8ef5d62e7010ba7f9644284c3e7675d42803eda9d99ed8967620fdabf1ff8a3358e7143b996eaa37e47d16833b6d934f09db0a4b4078a6b76c5
-AUX 1.8-elf-metadata-26a8d3fc57a7.patch 569 SHA256 8c695811ca9eae7d3b81674e8de255dc84e242972041ca54093a3d96f40fe34b SHA512 b9ea41cc265f3fcaba70cf69999abe7fc7cf0baed4ecae726680fc3ba8bddf9da0ccf32b08d9dbea1709be3379d2512009af657620decb0d8fca59e17d714669 WHIRLPOOL b643684e295c8033cf6ef654a66e4fed20fc0995056600dcc87f4605a94adf51895da21394c1471a7597776784409af409c0a6fd1f0476dc75ee5c9d954cb152
-AUX 1.8-sext-instructions-02dc2f6160ee.patch 1100 SHA256 599af03fb41902cb00b6c1768febd921276efbdc7b550d010676cc210f7564bb SHA512 f8c624fed1d77232cf32e10581af0cb74238a4ce225b72de2934c0a96c6a9b737515969438a724c22d1377aea20d03a580a1dc5e56769502ad2b8069e8dd5741 WHIRLPOOL c668c53a73d7b462f3048b4f0764052cbc0ea5a8e3a53050d29c6dd05b688d95cd0bb25f3f600f7638c7facd11191915512ef58c66f1615a09c956983919a324
AUX 1.9-distutils-fix_handling_of_executables_and_flags.patch 17956 SHA256 4ed9800fc851377a45ebf72c759322ebb005dd87100e2ebf634c11b418a56acf SHA512 9e4ee35c6c1286ec6a3748c747f68039d0da7b68cab6c21c6ee96caa38ef209fb31e0eec3978acb6e6c901b13aa781e8963045b86a7c00ab9668a73996317853 WHIRLPOOL df3a2b9b9e60ee06336c3ff4e469b1154a77855a0d57dfdbdab2e13719c710b93d5426bbe8e1e79c1f9934d726a0975eb1e6d108174f774c066aafdbe90f6101
AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 SHA256 dc17421bd12e4df5fed2fb1d113c9a8ca691b127631c48350aea1801c52360f1 SHA512 bdac189cbee2e4e91594bc8ea13f2477c3ab0dabec5a44bacf7a021f26d03ad5ceb813ffb38956b8a56e0791fc54c6396a909b9b40232476dd4cd6e0ee908bc0 WHIRLPOOL 035261b0659bdeeb24f6d45959dd1e218cde84dc6ded8d2ee8f9032b2311f7b5f32c6446f25aa81d6e80702d26ef8d4785e21e987282af737f6c9dfc57aa5bcf
AUX 1.9-get_python_lib_standard_lib-04ea518e5b71.patch 943 SHA256 5be762e004de248c599191e8a896fd4f3a61f1ba86494d679bec31fe67b1da6c SHA512 c5a8a7bc618b03140d88e6c91b31eecd18572f6aa0c2c4c966a1073d90dabb4cc66529d86b965d93b4f88c64913e275b79156d1afc94129e900a72c2940a6f82 WHIRLPOOL dc0bd34b4920d9391e2d12c7dec3df78660ac46cb0194425cd6aa767c6fd9c57a4e47877029f146860a402ef21460afb8a4b52073e3a989889fbe0b9e6039948
@@ -22,21 +19,18 @@ AUX 2.0-distutils-fix_handling_of_executables_and_flags.patch 15198 SHA256 9b2f9
AUX 2.0-no-static-hack.patch 1542 SHA256 75a92094d5f6c6bc2411a40f7432108c07c542e4b96de2b873a42fabf0f768eb SHA512 50c1087eae07fcef306de83ccde7edacea552e498f7dab3fa43626d05c38c9eaabf7a45780b8315b8b9d841da6086ee23cde1e51bf4796ac397e9b8d94bc316b WHIRLPOOL 97ca09dcf34602cce274611d607c0a1356f760a6e5d6b62010cec1fd33d677853b6cdab41fd52aedf0c5e506c331f80c37ec4547fae34ae9fc041fb14e9707ce
AUX pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch 18064 SHA256 43cbabdf5f7b094eb969c754bb6513fa324b1fadb40b37d78bd1ad47194d787a SHA512 eb6c70b84d204aca9975efd99ae66f8a629f275173a4551e99250e989fbfb1bc6d8696fa46e4a320425084540f845b6dd9068ebf6f7b17d99351c4d324b64049 WHIRLPOOL ba514f2b4f5746b90d380843bc09974fa3cd0657a8af9da12e4a780d03cd1213b022e92b5d6d0256b204084952f372a4af0f7de3a2a5c0baa7252957334c7546
AUX pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 569 SHA256 55ea809a5f3e264b1905b06aa3af78aae149451e7d74a98d11e87629ab69493e SHA512 d4627a762a5cbc45ea3f03686249b6fc206346d0514ecbb4e41c3c20f480c6fd9e689ec156a94dd8f88f4318fb48dc4a7b556e586e9f175627b6177391f64ca3 WHIRLPOOL 4f1b8e235851a52fc63c2022f98fdaa426d49f65a7e01e51625adc54efb0b17081a342db330ad269b8dbd4597db214c9b2cb32195048302addf1926ffb0e2464
-DIST pypy-1.8.tar.bz2 14927806 SHA256 ac98ad6d884207f8325ff4c783104ebea57a3fcddfef32abcdf97fd4307b6287 SHA512 d4360c3ece1860ec37171be7135e62552faf957cf51c259cb98572c1c3de321edc99b378319187b766bd3729536efe721c1d1a94783794228b1c22567addc7a8 WHIRLPOOL c1ee6381db9424c1d56028264eeb15310a8b1bbda26217526ecde7d2b2e80989fd61178b31aa31a03c7d7dc2843cdecb5fe8b47d702d6e4d820a09ad817e27f0
DIST pypy-1.9.tar.bz2 13466551 SHA256 9fd599acade49ef98017bbce4f179f19cf2680489ff15235d3bad5b20bde0d68 SHA512 1e02f1f1ac493be35272212f2be62db17a01a95c56ffbd8c00a043587e38131e779928fef1383c61575ecb48bf4dc407b62726d30d5b5728221a612fe67ec8c3 WHIRLPOOL 5b601f31f695623c2e5f6d48ae902e07c5cdccafe415ae89878e5cf71408b31fc44fb1c173a93e66d81188503651000de219533e69071495b87d80a8d217274f
DIST pypy-2.0_beta1.tar.bz2 13654084 SHA256 492fcdd8f37990e7364eb5f2c4b5c2b0f61b44b2603207b200fc2d4e44b413ce SHA512 50b8a26433fc04bb35c9a0669f7da94621eddb3e303c6eaf624b663e7b2f3656a80b238227204938fc22ef3c15fbabf1d04e09d3ddc0377be008f7f40d4c0721 WHIRLPOOL 07e2e430a1d01401a0bfbddb775652acaf09ab05d8d038a644454c9802a463cdb83287620ac8bb3af6f235d21228d1e462e3a041e5770773cb50786740ae259f
-EBUILD pypy-1.8-r1.ebuild 3148 SHA256 2b37dc20190cb79f1f543aca24e1abd1137debf92d7e5984850549948b67f0bc SHA512 f44c99d70f896b78d621e8c69d18b0f244c5e231a22aa930adf774618d42d76f55c7060575e43770b3a6b601ade7b8e52cac236a851ffddde17eee5aa877bb0e WHIRLPOOL 31f751c7cb3012823951d312a4ad4586e5c4d98fd684a7634b2fb4fbee457e3e0c3a9895c86fee5b8a284dba35c711f2c9ea7799426ab61f4a009daafe403284
-EBUILD pypy-1.8-r2.ebuild 3208 SHA256 f9f9cd0c16361f2064f12a1ec94407b21dcf8a4af2cea7130df12cad6b8b078d SHA512 e2ada0bdcb3ade63569194f8135c19a1370a649935335cb3a98732513de906d07cf554c940b8be290107361c13929152f321879b5561211eb2f09ab40c042433 WHIRLPOOL 7940cd82019b3a1493c8748c8d1a76931f8cf491767f2376ef37590f47f4feb82558f91bda636954ccefec07b6387bd2a89ffc51fad7001c0aa10dda68b4f9d2
EBUILD pypy-1.9-r1.ebuild 3824 SHA256 28babbcc17d1b081558493c8b0bbf568b98367d301ef8afaf060a584eefa6919 SHA512 2ee0246a13e399c7842e445062883c57525ea24314c1cfb43d10e4bb67607560a015dc2ad2ed7a24994ff528a0ea782efbac142ada5ad0a9171ea490494a82dd WHIRLPOOL 4702569f02d402de5e45159df05a272e9e853442c114889c634f3f996770c1f4fe7e3c3d8e8d56765bb03a0ecfdaabfad045e50670bd6452825db06bfd303e9f
EBUILD pypy-1.9-r2.ebuild 3882 SHA256 7b773bdabeb837c77ac094627720d3cea1b4bcda594e892b6e5e6c822a7ffbd0 SHA512 b7f99f227a124efecc3b8941eedb951ee64a567a5e22135b9fda3b492e5ee45914dc937b4c961b28b9f37fc87ec6c5e5e6d2df9ffc793979cccb5c96f85368cb WHIRLPOOL 23a177f47fba61c3200dab9097c58486d97270e6bf364bb90178598f14c22f549287a5892d18848fd34d09c8781dca8c6d7190eed48725b518b1a6bc14c5dd9d
EBUILD pypy-1.9.ebuild 3075 SHA256 4c49bc7e33ea8eccc5552e30cd2dab691ed579a5686b71ec97bccfa9336cc798 SHA512 3758cb3f6b0f34e45318e31a5765dffe369f0b63dbed1471f46c2c0c1948359026c413c19c77a95da5e16ebf96034186fc02a6bcf15f62dea5a034f6ccf13468 WHIRLPOOL 544d46da00f3e17c607cd284ac0413ccd565428e1d7a0217d1f2fd1bbb927433a9147b57957b293976c9eb26507e0365fedb26b58af0ad6bfdf6c16b27dd691e
EBUILD pypy-2.0_beta1.ebuild 3256 SHA256 066fec7de699b2e886fbbbf88bf29cde781eb751fea8be9a95cb171278f54c3c SHA512 f1a7b2470b86d7746dde061e2d6d2d92c1177983df6831226f7b859ffa3c7c1c01a3bdc11e147fb92853b7cde25d532f223baed909b254a30ee3ed690ad4a218 WHIRLPOOL e6cd7c35a110d159760c69429058b757197129e1b56f8821c7885a813cb359742a6a75d9633563074682f72c330c9b479573e83ec3633d1c413431ffaabdbbb9
-MISC ChangeLog 5982 SHA256 a7f00d5a1c20cd099dc08104d9ec0aafeb8efd7439497497a4ae1dac4091402d SHA512 e7596844973c02829531ca16228909178a371b36f463c53bad1467bc0585389659b5cdd8a332f29d8267379ea0a5877ee603184b5d0f28174b0afb227b842a6b WHIRLPOOL 459424be5ad0c7db2fad9da7a95a650effb1dfbd783aaf2371b9f5dec82de63e48ba456d8743ff7870876ce847cd0d9dc78d7251ffeb9ae0c2b101fccf8c1d3f
+MISC ChangeLog 6227 SHA256 fd2c2d3bbf1461017f19f5e850b8233ae8ccbd3c3181075e54a0a151bae9a2d6 SHA512 0a27731f244a3d93f2d26b2768639a08a72e7bd93d03cf8713849c6af36922110c2858bff46c0ef3853dd0c36fcdb1b3aebda2640c11a324b35a87ed8827b93f WHIRLPOOL 8721c39e6c8d2c412e8eaefff00c45728e5e4fcfb185e514ba4fec8334bce30004392f058c83da9be9cc331062078d20cd1445d92373c85aff9488e1c88e5a2e
MISC metadata.xml 317 SHA256 cc6a42b7408bb6e6cebac0475a3419ff0f0e97c1301d5bdef029b3c24e278155 SHA512 87f0c04a0a10af65c51f587c3937995dcd5ddffe02caab1939a5562ddfbadd6baf5c8793c5f74717887d5779aaad6b7249a2a12d7f0f840cca6d79cdffa2ad7a WHIRLPOOL f5a509de1f99f97266128d34b79654a848c72d6a58caa19491874abe7c37fab047d6684c15397ed6f37f8b6e2ef35c0bc3e2831dd7d37739bc36116cc1b49284
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlDjunQACgkQC77qH+pIQ6RL/gD/W6ppahCE8+yKgJ6pC2UvY5k0
-rpKFadqaavGJNG7hjyEBAI0aL8yCPUB5rf2MZVt/ymhlHReOdgaU5ruJNF6OVrfF
-=OVhy
+iEYEAREIAAYFAlEXWQUACgkQCaWpQKGI+9QTIwCfTLsbP7ehbFaWlaDC90iOuLmh
+VO0AmgJqapOXmee1o7wjGXC8QAHzEGY1
+=sGE/
-----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/files/1.7-scripts-location.patch b/dev-python/pypy/files/1.7-scripts-location.patch
deleted file mode 100644
index 91b5ced96247..000000000000
--- a/dev-python/pypy/files/1.7-scripts-location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pypy-pypy-release-1.7/lib-python/modified-2.7/distutils/command/install.py
-+++ pypy-pypy-release-1.7/lib-python/modified-2.7/distutils/command/install.py
-@@ -87,7 +87,7 @@
- 'purelib': '$base/site-packages',
- 'platlib': '$base/site-packages',
- 'headers': '$base/include',
-- 'scripts': '$base/bin',
-+ 'scripts': '/usr/bin',
- 'data' : '$base',
- },
- }
diff --git a/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch b/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch
deleted file mode 100644
index d58137350e2d..000000000000
--- a/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py.bak 2011-11-29 14:22:29.000000000 +0100
-+++ pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py 2011-11-29 14:22:55.000000000 +0100
-@@ -1694,6 +1694,7 @@
- }
- """
- elif self.format in ('elf64', 'darwin64'):
-+ print >> output, "\t.section .note.GNU-stack,\"\",%progbits"
- print >> output, "\t.text"
- print >> output, "\t.globl %s" % _globalname('pypy_asm_stackwalk')
- _variant(elf64='.type pypy_asm_stackwalk, @function',
diff --git a/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch b/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch
deleted file mode 100644
index 6528479e098c..000000000000
--- a/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- pypy/translator/c/gcc/trackgcroot.py.old 2012-02-15 14:11:38.551479431 -0800
-+++ pypy/translator/c/gcc/trackgcroot.py 2012-02-15 00:55:20.082136135 -0800
-@@ -471,8 +471,8 @@
- return []
-
- IGNORE_OPS_WITH_PREFIXES = dict.fromkeys([
-- 'cmp', 'test', 'set', 'sahf', 'lahf', 'cltd', 'cld', 'std',
-- 'rep', 'movs', 'lods', 'stos', 'scas', 'cwtl', 'cwde', 'prefetch',
-+ 'cmp', 'test', 'set', 'sahf', 'lahf', 'cld', 'std',
-+ 'rep', 'movs', 'lods', 'stos', 'scas', 'cwde', 'prefetch',
- # floating-point operations cannot produce GC pointers
- 'f',
- 'cvt', 'ucomi', 'comi', 'subs', 'subp' , 'adds', 'addp', 'xorp',
-@@ -485,6 +485,8 @@
- 'bswap', 'bt', 'rdtsc',
- 'punpck', 'pshufd', 'pcmp', 'pand', 'psllw', 'pslld', 'psllq',
- 'paddq', 'pinsr',
-+ # sign-extending moves should not produce GC pointers
-+ 'cbtw', 'cwtl', 'cwtd', 'cltd', 'cltq', 'cqto',
- # zero-extending moves should not produce GC pointers
- 'movz',
- # locked operations should not move GC pointers, at least so far
diff --git a/dev-python/pypy/pypy-1.8-r1.ebuild b/dev-python/pypy/pypy-1.8-r1.ebuild
deleted file mode 100644
index 12d8b4e639cc..000000000000
--- a/dev-python/pypy/pypy-1.8-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.8-r1.ebuild,v 1.4 2012/11/18 02:06:28 floppym Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs check-reqs python versionator
-
-DESCRIPTION="PyPy is a fast, compliant alternative implementation of the Python language"
-HOMEPAGE="http://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV}.tar.bz2 -> ${P}.tar.bz2"
-SLOTVER=$(get_version_component_range 1-2 ${PV})
-
-LICENSE="MIT"
-SLOT="${SLOTVER}"
-PYTHON_ABI="2.7-pypy-${SLOTVER}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- dev-libs/expat
- bzip2? ( app-arch/bzip2 )
- ncurses? ( sys-libs/ncurses )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-PDEPEND="app-admin/python-updater"
-
-pkg_pretend() {
- CHECKREQS_MEMORY="2G"
- use amd64 && CHECKREQS_MEMORY="4G"
- check-reqs_pkg_pretend
-}
-
-src_unpack() {
- default
- mv pypy-pypy-* "${S}" || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-elf-metadata-26a8d3fc57a7.patch"
- epatch "${FILESDIR}/${PV}-sext-instructions-02dc2f6160ee.patch"
- epatch "${FILESDIR}/1.7-scripts-location.patch"
- epatch "${FILESDIR}/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
- epatch "${FILESDIR}/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch"
-}
-
-src_compile() {
- local conf
- if use jit; then
- conf="-Ojit"
- else
- conf="-O2"
- fi
- if use shadowstack; then
- conf+=" --gcrootfinder=shadowstack"
- fi
- if use sandbox; then
- conf+=" --sandbox"
- fi
-
- conf+=" ./pypy/translator/goal/targetpypystandalone.py"
- # Avoid linking against libraries disabled by use flags
- local optional_use=("bzip2" "ncurses" "ssl")
- local optional_mod=("bz2" "_minimal_curses" "_ssl")
- for ((i = 0; i < ${#optional_use[*]}; i++)); do
- if use ${optional_use[$i]}; then
- conf+=" --withmod-${optional_mod[$i]}"
- else
- conf+=" --withoutmod-${optional_mod[$i]}"
- fi
- done
-
- local translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py --batch $conf"
- echo ${_BOLD}"${translate_cmd}"${_NORMAL}
- ${translate_cmd} || die "compile error"
-}
-
-src_install() {
- local INSPATH="/usr/$(get_libdir)/pypy${SLOT}"
- insinto ${INSPATH}
- doins -r include lib_pypy lib-python pypy-c
- fperms a+x ${INSPATH}/pypy-c
- dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
- dodoc README
-
- if ! use sqlite; then
- rm -fr "${ED}${INSPATH}/lib-python/2.7/sqlite3"
- rm -fr "${ED}${INSPATH}/lib-python/modified-2.7/sqlite3"
- rm -f "${ED}${INSPATH}/lib_pypy/_sqlite3.py"
- fi
-
- # Generate Grammar and PatternGrammar pickles.
- PYTHONPATH="${ED}${INSPATH}/lib_pypy/__extensions__:${ED}${INSPATH}/lib_pypy:${ED}${INSPATH}/lib-python/modified-2.7:${ED}${INSPATH}/lib-python/2.7" "${ED}${INSPATH}/pypy-c" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" || die "Generation of Grammar and PatternGrammar pickles failed"
-}
-
-src_test() {
- $(PYTHON -2) ./pypy/test_all.py --pypy=./pypy-c lib-python
-}
diff --git a/dev-python/pypy/pypy-1.8-r2.ebuild b/dev-python/pypy/pypy-1.8-r2.ebuild
deleted file mode 100644
index 64a1cde7feb6..000000000000
--- a/dev-python/pypy/pypy-1.8-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.8-r2.ebuild,v 1.3 2012/12/02 01:58:58 floppym Exp $
-
-EAPI=5
-
-# XXX: test other implementations
-PYTHON_COMPAT=( python2_7 pypy1_8 )
-inherit check-reqs eutils multilib 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/pypy/pypy/get/release-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT=$(get_version_component_range 1-2 ${PV})
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
- virtual/libffi
- virtual/libintl
- dev-libs/expat
- bzip2? ( app-arch/bzip2 )
- ncurses? ( sys-libs/ncurses )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}"
-PDEPEND="app-admin/python-updater"
-
-pkg_pretend() {
- CHECKREQS_MEMORY="2G"
- use amd64 && CHECKREQS_MEMORY="4G"
- check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- pkg_pretend
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-elf-metadata-26a8d3fc57a7.patch"
- epatch "${FILESDIR}/${PV}-sext-instructions-02dc2f6160ee.patch"
- epatch "${FILESDIR}/1.7-scripts-location.patch"
- epatch "${FILESDIR}/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
- epatch "${FILESDIR}/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch"
-}
-
-src_compile() {
- local args=(
- $(usex jit -Ojit -O2)
- $(usex shadowstack --gcrootfinder=shadowstack '')
- $(usex sandbox --sandbox '')
-
- ./pypy/translator/goal/targetpypystandalone.py
- )
-
- # Avoid linking against libraries disabled by use flags
- local opts=(
- bzip2:bz2
- ncurses:_minimal_curses
- ssl:_ssl
- )
-
- local opt
- for opt in "${opts[@]}"; do
- local flag=${opt%:*}
- local mod=${opt#*:}
-
- args+=(
- $(usex ${flag} --withmod --withoutmod)-${mod}
- )
- done
-
- set -- "${PYTHON}" ./pypy/translator/goal/translate.py --batch "${args[@]}"
- echo -e "\033[1m${@}\033[0m"
- "${@}" || die "compile error"
-}
-
-src_install() {
- local INSDESTTREE=/usr/$(get_libdir)/pypy${SLOT}
- doins -r include lib_pypy lib-python pypy-c
- fperms a+x ${INSDESTTREE}/pypy-c
- dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT}
- dodoc README
-
- if ! use sqlite; then
- rm -fr "${ED}${INSDESTTREE}"/lib-python/{2.7,modified-2.7}/sqlite3
- rm -f "${ED}${INSDESTTREE}"/lib_pypy/_sqlite3.py
- fi
-
- python_export pypy-c${SLOT} EPYTHON PYTHON PYTHON_SITEDIR
-
- # if not using a cross-compiler, use the fresh binary
- if ! tc-is-cross-compiler; then
- local PYTHON=${ED}${INSDESTTREE}/pypy-c
- fi
-
- # Generate Grammar and PatternGrammar pickles.
- PYTHONPATH="${ED}${INSDESTTREE}/lib-python/2.7" \
- "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
- || die "Generation of Grammar and PatternGrammar pickles failed"
-
- # compile the installed modules
- python_optimize "${ED}${INSDESTTREE}"
-
- echo "EPYTHON='${EPYTHON}'" > epython.py
- python_domodule epython.py
-}
-
-src_test() {
- "${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python
-}