commit: a5bfdb537cfc5c2afe96245ea1ce64cd14ca42ab
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 8 08:51:15 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 8 11:32:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5bfdb53
dev-python/pypy: Sync the live ebuild
dev-python/pypy/Manifest | 1 -
dev-python/pypy/pypy-5.6.0.ebuild | 3 ++-
dev-python/pypy/pypy-9999.ebuild | 15 +++++++++------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 37e044d0300..d51c126c4f8 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,3 +1,2 @@
DIST pypy2-v5.6.0-src.tar.bz2 18388539 SHA256
7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0 SHA512
a92ef611ae2417aaa202b9f5c75dd86e82fc2549e53bab3164cccff37d131542bc71cbce6aaedf428d3dfc7d59a2d3b3a5ed03e3a3439628f29d43c4d30a64de
WHIRLPOOL
896894225407f8cd462b094d77723880f6a423d60a79e5d3cf4e0804737fdd0337fc668b05573902fe81f826798b2046cb115c8d230f0810ec0ad2508590ee4a
-DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256
c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512
5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056
WHIRLPOOL
f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9
DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256
e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512
f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52
WHIRLPOOL
305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
diff --git a/dev-python/pypy/pypy-5.6.0.ebuild
b/dev-python/pypy/pypy-5.6.0.ebuild
index bb7e5f512e0..ce1b1a3f764 100644
--- a/dev-python/pypy/pypy-5.6.0.ebuild
+++ b/dev-python/pypy/pypy-5.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,6 +6,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 pypy )
inherit check-reqs eutils 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.11-0"
MY_P=pypy2-v${PV}
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index 934901318e8..de88fb98a5f 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,15 +7,18 @@ PYTHON_COMPAT=( python2_7 pypy )
EHG_REPO_URI="https://bitbucket.org/pypy/pypy";
inherit check-reqs eutils mercurial multilib multiprocessing pax-utils
python-any-r1 toolchain-funcs versionator
-CPY_PATCHSET_VERSION="2.7.10-0"
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+CPY_PATCHSET_VERSION="2.7.11-0"
+MY_P=pypy2-v${PV}
DESCRIPTION="A fast, compliant alternative implementation of the Python
language"
HOMEPAGE="http://pypy.org/";
SRC_URI="
-
https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz";
+
https://dev.gentoo.org/~djc/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz";
LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1-2 ${PV})"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
KEYWORDS=""
IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox +shadowstack
sqlite cpu_flags_x86_sse2 test tk"
@@ -39,7 +42,7 @@ DEPEND="${RDEPEND}
${PYTHON_DEPS}
test? ( dev-python/pytest )"
-S="${WORKDIR}/${P}-src"
+S="${WORKDIR}/${MY_P}-src"
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
@@ -100,7 +103,7 @@ src_prepare() {
# apply CPython stdlib patches
pushd lib-python/2.7 > /dev/null || die
- epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch \
+ epatch "${FILESDIR}"/5.6.0_all_distutils_cxx.patch \
"${WORKDIR}"/patches/22_all_turkish_locale.patch \
"${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
popd > /dev/null || die
