| 1 |
commit: b03b6ba8e752ab4a46c122cea11894aee2902f51 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 8 10:30:51 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 8 11:32:43 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03b6ba8 |
| 7 |
|
| 8 |
dev-python/pypy3: Sync the live ebuild |
| 9 |
|
| 10 |
dev-python/pypy3/pypy3-5.5.0_alpha.ebuild | 2 +- |
| 11 |
dev-python/pypy3/pypy3-9999.ebuild | 39 +++++++++++++++++++++++-------- |
| 12 |
2 files changed, 30 insertions(+), 11 deletions(-) |
| 13 |
|
| 14 |
diff --git a/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild b/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild |
| 15 |
index dbb9982ab18..53fc3868981 100644 |
| 16 |
--- a/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild |
| 17 |
+++ b/dev-python/pypy3/pypy3-5.5.0_alpha.ebuild |
| 18 |
@@ -1,4 +1,4 @@ |
| 19 |
-# Copyright 1999-2016 Gentoo Foundation |
| 20 |
+# Copyright 1999-2017 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
EAPI=5 |
| 24 |
|
| 25 |
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild |
| 26 |
index e21f16d77a6..9c486a55bf3 100644 |
| 27 |
--- a/dev-python/pypy3/pypy3-9999.ebuild |
| 28 |
+++ b/dev-python/pypy3/pypy3-9999.ebuild |
| 29 |
@@ -1,4 +1,4 @@ |
| 30 |
-# Copyright 1999-2016 Gentoo Foundation |
| 31 |
+# Copyright 1999-2017 Gentoo Foundation |
| 32 |
# Distributed under the terms of the GNU General Public License v2 |
| 33 |
|
| 34 |
EAPI=5 |
| 35 |
@@ -11,12 +11,16 @@ EHG_REVISION="py3k" |
| 36 |
inherit check-reqs eutils mercurial multilib multiprocessing pax-utils \ |
| 37 |
python-any-r1 toolchain-funcs versionator |
| 38 |
|
| 39 |
-DESCRIPTION="A fast, compliant alternative implementation of Python 3" |
| 40 |
+CPY_PATCHSET_VERSION="3.3.5-0" |
| 41 |
+ |
| 42 |
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) language" |
| 43 |
HOMEPAGE="http://pypy.org/" |
| 44 |
-SRC_URI="" |
| 45 |
+SRC_URI=" |
| 46 |
+ https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz" |
| 47 |
|
| 48 |
LICENSE="MIT" |
| 49 |
-SLOT="0/$(get_version_component_range 1-2 ${PV})" |
| 50 |
+# XX from pypy3-XX.so module suffix |
| 51 |
+SLOT="0/55" |
| 52 |
KEYWORDS="" |
| 53 |
IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 tk" |
| 54 |
|
| 55 |
@@ -24,8 +28,8 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= |
| 56 |
virtual/libffi:0= |
| 57 |
virtual/libintl:0= |
| 58 |
dev-libs/expat:0= |
| 59 |
- !libressl? ( dev-libs/openssl:0= ) |
| 60 |
- libressl? ( dev-libs/libressl:= ) |
| 61 |
+ !libressl? ( dev-libs/openssl:0=[-bindist] ) |
| 62 |
+ libressl? ( dev-libs/libressl:0= ) |
| 63 |
bzip2? ( app-arch/bzip2:0= ) |
| 64 |
gdbm? ( sys-libs/gdbm:0= ) |
| 65 |
ncurses? ( sys-libs/ncurses:0= ) |
| 66 |
@@ -38,8 +42,10 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= |
| 67 |
DEPEND="${RDEPEND} |
| 68 |
low-memory? ( virtual/pypy:0 ) |
| 69 |
!low-memory? ( ${PYTHON_DEPS} )" |
| 70 |
+# doc? ( dev-python/sphinx ) |
| 71 |
|
| 72 |
-S="${WORKDIR}/${P}-src" |
| 73 |
+# Who would care about predictable directory names? |
| 74 |
+S="${WORKDIR}/pypy3-v${PV%_*}-src" |
| 75 |
|
| 76 |
pkg_pretend() { |
| 77 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 78 |
@@ -90,7 +96,8 @@ src_prepare() { |
| 79 |
|
| 80 |
# apply CPython stdlib patches |
| 81 |
pushd lib-python/3 > /dev/null || die |
| 82 |
- epatch "${FILESDIR}"/5.2.0-distutils-c++.patch |
| 83 |
+ epatch "${FILESDIR}"/5.2.0-distutils-c++.patch \ |
| 84 |
+ "${WORKDIR}"/patches/24_all_sqlite-3.8.4.patch |
| 85 |
popd > /dev/null || die |
| 86 |
|
| 87 |
epatch_user |
| 88 |
@@ -161,6 +168,15 @@ src_compile() { |
| 89 |
pax-mark m pypy-c libpypy-c.so |
| 90 |
} |
| 91 |
|
| 92 |
+src_test() { |
| 93 |
+ # (unset) |
| 94 |
+ local -x PYTHONDONTWRITEBYTECODE |
| 95 |
+ |
| 96 |
+ # Test runner requires Python 2 too. However, it spawns PyPy3 |
| 97 |
+ # internally so that we end up testing the correct interpreter. |
| 98 |
+ "${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python || die |
| 99 |
+} |
| 100 |
+ |
| 101 |
src_install() { |
| 102 |
local dest=/usr/$(get_libdir)/pypy3 |
| 103 |
einfo "Installing PyPy ..." |
| 104 |
@@ -213,9 +229,12 @@ src_install() { |
| 105 |
# "tk": "_tkinter/tklib_build.py", |
| 106 |
# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
| 107 |
# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
| 108 |
-# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
| 109 |
+# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
| 110 |
# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
| 111 |
- cffi_targets=( audioop syslog pwdgrp ) |
| 112 |
+# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
| 113 |
+# "lzma": "_lzma_build.py", |
| 114 |
+# "_decimal": "_decimal_build.py", |
| 115 |
+ cffi_targets=( audioop syslog pwdgrp resource lzma decimal ) |
| 116 |
use gdbm && cffi_targets+=( gdbm ) |
| 117 |
use ncurses && cffi_targets+=( curses ) |
| 118 |
use sqlite && cffi_targets+=( sqlite3 ) |
Archives