commit: 120efe206fbea6a42c5c9a484f1c6b8920ff83ad
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 20:47:28 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 16:24:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=120efe20
dev-python/pypy: Bump to 7.2.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pypy/Manifest | 1 +
.../pypy/{pypy-9999.ebuild => pypy-7.2.0.ebuild} | 41 ++++++++++------------
dev-python/pypy/pypy-9999.ebuild | 29 +++++++--------
3 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 16213caaed8..41aeb208617 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,2 +1,3 @@
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
DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B
5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591
SHA512
687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
diff --git a/dev-python/pypy/pypy-9999.ebuild
b/dev-python/pypy/pypy-7.2.0.ebuild
similarity index 89%
copy from dev-python/pypy/pypy-9999.ebuild
copy to dev-python/pypy/pypy-7.2.0.ebuild
index 708273fc4d5..15c787deb86 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-7.2.0.ebuild
@@ -4,24 +4,23 @@
EAPI=7
PYTHON_COMPAT=( python2_7 pypy )
-EHG_REPO_URI="https://bitbucket.org/pypy/pypy";
-inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs
+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="
+HOMEPAGE="https://pypy.org/";
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz";
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=""
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite
cpu_flags_x86_sse2 test tk"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite
cpu_flags_x86_sse2 tk"
RDEPEND=">=sys-libs/zlib-1.1.3:0=
virtual/libffi:0=
@@ -99,11 +98,6 @@ pkg_setup() {
fi
}
-src_unpack() {
- default
- mercurial_src_unpack
-}
-
src_prepare() {
eapply "${FILESDIR}/7.0.0-gentoo-path.patch"
eapply
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
@@ -202,6 +196,7 @@ src_compile() {
# Generate cffi modules
# Please keep in sync with pypy/tool/build_cffi_imports.py!
#cffi_build_scripts = {
+# "_ssl": "_ssl_build.py",
# "sqlite3": "_sqlite3_build.py",
# "audioop": "_audioop_build.py",
# "tk": "_tkinter/tklib_build.py",
@@ -210,7 +205,7 @@ src_compile() {
# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
# "resource": "_resource_build.py" if sys.platform != "win32" else None,
- cffi_targets=( audioop syslog pwdgrp resource )
+ cffi_targets=( ssl audioop syslog pwdgrp resource )
use gdbm && cffi_targets+=( gdbm )
use ncurses && cffi_targets+=( curses )
use sqlite && cffi_targets+=( sqlite3 )
@@ -253,7 +248,7 @@ src_install() {
einfo "Installing PyPy ..."
exeinto "${dest}"
doexe pypy-c libpypy-c.so
- pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+ pax-mark m "${ED}${dest}/pypy-c" "${ED}${dest}/libpypy-c.so"
insinto "${dest}"
# preserve mtimes to avoid obsoleting caches
insopts -p
@@ -262,21 +257,21 @@ src_install() {
dodoc README.rst
if ! use gdbm; then
- rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
- "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py ||
die
+ rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+ "${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
fi
if ! use sqlite; then
- rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
- "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
- "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py ||
die
+ rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+ "${ED}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py ||
die
fi
if ! use tk; then
- rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
- "${ED%/}${dest}"/lib_pypy/_tkinter \
-
"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+ rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+ "${ED}${dest}"/lib_pypy/_tkinter \
+
"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
fi
- local -x PYTHON=${ED%/}${dest}/pypy-c
+ local -x PYTHON=${ED}${dest}/pypy-c
# we can't use eclass function since PyPy is dumb and always gives
# paths relative to the interpreter
local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
@@ -288,5 +283,5 @@ src_install() {
einfo "Byte-compiling Python standard library..."
# compile the installed modules
- python_optimize "${ED%/}${dest}"
+ python_optimize "${ED}${dest}"
}
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index 708273fc4d5..f4acfd24ccc 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -12,7 +12,7 @@ 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/";
+HOMEPAGE="https://pypy.org/";
SRC_URI="
https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz";
@@ -21,7 +21,7 @@ LICENSE="MIT"
# pypy 7.0.0: install directory changed to 'pypy2.7'
SLOT="0/41-py27"
KEYWORDS=""
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite
cpu_flags_x86_sse2 test tk"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite
cpu_flags_x86_sse2 tk"
RDEPEND=">=sys-libs/zlib-1.1.3:0=
virtual/libffi:0=
@@ -202,6 +202,7 @@ src_compile() {
# Generate cffi modules
# Please keep in sync with pypy/tool/build_cffi_imports.py!
#cffi_build_scripts = {
+# "_ssl": "_ssl_build.py",
# "sqlite3": "_sqlite3_build.py",
# "audioop": "_audioop_build.py",
# "tk": "_tkinter/tklib_build.py",
@@ -210,7 +211,7 @@ src_compile() {
# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
# "resource": "_resource_build.py" if sys.platform != "win32" else None,
- cffi_targets=( audioop syslog pwdgrp resource )
+ cffi_targets=( ssl audioop syslog pwdgrp resource )
use gdbm && cffi_targets+=( gdbm )
use ncurses && cffi_targets+=( curses )
use sqlite && cffi_targets+=( sqlite3 )
@@ -253,7 +254,7 @@ src_install() {
einfo "Installing PyPy ..."
exeinto "${dest}"
doexe pypy-c libpypy-c.so
- pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+ pax-mark m "${ED}${dest}/pypy-c" "${ED}${dest}/libpypy-c.so"
insinto "${dest}"
# preserve mtimes to avoid obsoleting caches
insopts -p
@@ -262,21 +263,21 @@ src_install() {
dodoc README.rst
if ! use gdbm; then
- rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
- "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py ||
die
+ rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+ "${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
fi
if ! use sqlite; then
- rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
- "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
- "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py ||
die
+ rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+ "${ED}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py ||
die
fi
if ! use tk; then
- rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
- "${ED%/}${dest}"/lib_pypy/_tkinter \
-
"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+ rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+ "${ED}${dest}"/lib_pypy/_tkinter \
+
"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
fi
- local -x PYTHON=${ED%/}${dest}/pypy-c
+ local -x PYTHON=${ED}${dest}/pypy-c
# we can't use eclass function since PyPy is dumb and always gives
# paths relative to the interpreter
local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
@@ -288,5 +289,5 @@ src_install() {
einfo "Byte-compiling Python standard library..."
# compile the installed modules
- python_optimize "${ED%/}${dest}"
+ python_optimize "${ED}${dest}"
}
