[patch] pypy3 6.0.0 to 7.0.0 ebuild patch

pypy3_6_to_7.patch (text/plain), 2.41 KB, created by Sander Sweers on 2019-02-07 18:05:05 UTC

--- pypy3-6.0.0.ebuild	2019-02-07 18:53:07.575967569 +0100
+++ pypy3-7.0.0.ebuild	2019-02-07 00:50:09.689378068 +0100
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # pypy3 needs to be built using python 2
 PYTHON_COMPAT=( python2_7 pypy )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 
-MY_P=pypy3-v${PV}
+MY_P=pypy3.5-v${PV}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python (3.5) language"
 HOMEPAGE="http://pypy.org/"
@@ -15,7 +15,7 @@
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/60"
+SLOT="0/71"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
 
@@ -84,17 +84,12 @@
 }
 
 src_prepare() {
-	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
 	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
 	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
 
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-e "s^@libdir@^$(get_libdir)^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
+	# apply CPython stdlib patches	
+	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
 	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
 	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
 	popd > /dev/null || die
 
@@ -201,7 +196,7 @@
 }
 
 src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
+	local dest=/usr/$(get_libdir)/pypy3.5
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy3-c libpypy3-c.so
@@ -210,7 +205,7 @@
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
 	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
+	dosym ../$(get_libdir)/pypy3.5/pypy3-c /usr/bin/pypy3
 	dodoc README.rst
 
 	if ! use gdbm; then
@@ -232,7 +227,7 @@
 	local -x PYTHON=${ED%/}${dest}/pypy3-c
 	# we can't use eclass function since PyPy is dumb and always gives
 	# paths relative to the interpreter
-	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3.5/site-packages
 	python_export pypy3 EPYTHON
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die