commit: ccc170f64e0040984d5306106a1c395f330bebed
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 5 17:40:25 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 9 18:58:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccc170f6
dev-python/pypy: Bump to 5.9.0
dev-python/pypy/Manifest | 2 ++
dev-python/pypy/files/5.9.0-shared-lib.patch | 12 ++++++++++++
dev-python/pypy/{pypy-9999.ebuild => pypy-5.9.0.ebuild} | 16 +++++-----------
dev-python/pypy/pypy-9999.ebuild | 4 ++--
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index e454f08ba6b..6a21a59a297 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,5 +1,7 @@
DIST pypy2-v5.6.0-src.tar.bz2 18388539 SHA256
7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0 SHA512
a92ef611ae2417aaa202b9f5c75dd86e82fc2549e53bab3164cccff37d131542bc71cbce6aaedf428d3dfc7d59a2d3b3a5ed03e3a3439628f29d43c4d30a64de
WHIRLPOOL
896894225407f8cd462b094d77723880f6a423d60a79e5d3cf4e0804737fdd0337fc668b05573902fe81f826798b2046cb115c8d230f0810ec0ad2508590ee4a
DIST pypy2-v5.7.1-src.tar.bz2 18940413 SHA256
d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f SHA512
1ad2dddb40c28d2d3e95a9f0730e765d981dee6e2d0664cf1274eb7c1021690a848c3485c846eac8a8b64425b44946b5b2d223058ec4699155a2122ee7d38b75
WHIRLPOOL
e0223d889a26f8a5bc5097561dbe617ff9b11972590f3a8d717d572798a2d685540bc6059e4ce4ff73ce0db9d2476a4274f17dad1f825fb780726d6ecd78a4c8
DIST pypy2-v5.8.0-src.tar.bz2 19163498 SHA256
504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5 SHA512
222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365
WHIRLPOOL
775fbe656996e80fce9cb9a4d4f44fe1b87f0b22f18f74940d5824143337773bb5e3a4d23564bfdc22d010693010f31689026432134a8a2e30ddee670dba1b6d
+DIST pypy2-v5.9.0-src.tar.bz2 19175394 SHA256
de4bf05df47f1349dbac97233d9277bbaf1ef3331663ea2557fd5da3dbcfd0a7 SHA512
3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
WHIRLPOOL
5cbfc6922469450fdd55cda79afbd41e5750446eb09396ea53a65d6fbe099905103f14ab08665ecd76bf4da44f11d2c4609d8df97999a41d03f2985d6fae32fa
DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256
e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512
f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52
WHIRLPOOL
305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77
DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256
271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512
d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad
WHIRLPOOL
6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d
+DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 SHA256
3567feeb8f0c66161efaea1922bbfe4e71f6051533ef5f54a74b6ccf9e0359b6 SHA512
6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
WHIRLPOOL
ab77023ac66def132d1dce72f98add3108fd7be303ef5b167a2374df3a94949c75f089dcfdd84ed05a5eb813d6c22cfecd0de03b5819817a20b04f30030f5f6d
diff --git a/dev-python/pypy/files/5.9.0-shared-lib.patch
b/dev-python/pypy/files/5.9.0-shared-lib.patch
new file mode 100644
index 00000000000..5d89d3b15a3
--- /dev/null
+++ b/dev-python/pypy/files/5.9.0-shared-lib.patch
@@ -0,0 +1,12 @@
+diff -dupr a/rpython/translator/platform/posix.py
b/rpython/translator/platform/posix.py
+--- a/rpython/translator/platform/posix.py 2017-10-05 20:17:25.009954656
+0200
++++ b/rpython/translator/platform/posix.py 2017-10-05 20:17:31.115666386
+0200
+@@ -227,7 +227,7 @@ class BasePosix(Platform):
+ 'int main(int argc, char* argv[]) '
+ '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
+ m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
+- ['$(CC_LINK) $(LDFLAGS_LINK) main.o -L.
-l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)', '$(MAKE) postcompile
BIN=$(DEFAULT_TARGET)'])
++ ['$(CC_LINK) $(LDFLAGS_LINK) main.o -L.
-l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@', '$(MAKE) postcompile
BIN=$(DEFAULT_TARGET)'])
+
+ return m
+
diff --git a/dev-python/pypy/pypy-9999.ebuild
b/dev-python/pypy/pypy-5.9.0.ebuild
similarity index 96%
copy from dev-python/pypy/pypy-9999.ebuild
copy to dev-python/pypy/pypy-5.9.0.ebuild
index eaf3b675ad2..0ac7919c6ef 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-5.9.0.ebuild
@@ -4,22 +4,21 @@
EAPI=6
PYTHON_COMPAT=( python2_7 pypy )
-EHG_REPO_URI="https://bitbucket.org/pypy/pypy";
-inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs
versionator
+inherit check-reqs 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.13-0"
+CPY_PATCHSET_VERSION="2.7.14-0"
MY_P=pypy2-v${PV}
DESCRIPTION="A fast, compliant alternative implementation of the Python
language"
HOMEPAGE="http://pypy.org/";
-SRC_URI="
+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")'
SLOT="0/41"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite
cpu_flags_x86_sse2 test tk"
RDEPEND=">=sys-libs/zlib-1.1.3:0=
@@ -87,15 +86,10 @@ pkg_setup() {
fi
}
-src_unpack() {
- default
- mercurial_src_unpack
-}
-
src_prepare() {
eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
eapply
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
- eapply "${FILESDIR}"/2.5.0-shared-lib.patch # 517002
+ eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002
sed -e "s^@EPREFIX@^${EPREFIX}^" \
-e "s^@libdir@^$(get_libdir)^" \
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index eaf3b675ad2..f028a5b6e80 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -8,7 +8,7 @@ EHG_REPO_URI="https://bitbucket.org/pypy/pypy";
inherit check-reqs mercurial 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.13-0"
+CPY_PATCHSET_VERSION="2.7.14-0"
MY_P=pypy2-v${PV}
DESCRIPTION="A fast, compliant alternative implementation of the Python
language"
@@ -95,7 +95,7 @@ src_unpack() {
src_prepare() {
eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
eapply
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
- eapply "${FILESDIR}"/2.5.0-shared-lib.patch # 517002
+ eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002
sed -e "s^@EPREFIX@^${EPREFIX}^" \
-e "s^@libdir@^$(get_libdir)^" \
