[patch] pypy 6.0.0 to 7.0.0 ebuild patch

pypy_6_7_ebuild.patch (text/plain), 2.00 KB, created by Sander Sweers on 2019-02-09 11:43:01 UTC

--- pypy-6.0.0.ebuild	2019-02-09 10:53:52.548820710 +0100
+++ pypy-7.0.0.ebuild	2019-02-09 10:40:09.844948563 +0100
@@ -1,14 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 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
 
 # note: remember to update this to newest dev-lang/python:2.7 on bump
 CPY_PATCHSET_VERSION="2.7.14-0"
-MY_P=pypy2-v${PV}
+MY_P=pypy2.7-v${PV}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python language"
 HOMEPAGE="http://pypy.org/"
@@ -98,14 +98,9 @@
 }
 
 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/2.7/distutils/command/install.py || die
-
 	# apply CPython stdlib patches
 	pushd lib-python/2.7 > /dev/null || die
 	# TODO: cpy turkish locale patch now fixes C code
@@ -243,7 +238,7 @@
 }
 
 src_install() {
-	local dest=/usr/$(get_libdir)/pypy
+	local dest=/usr/$(get_libdir)/pypy2.7
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy-c libpypy-c.so
@@ -252,7 +247,7 @@
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
 	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dosym ../$(get_libdir)/pypy2.7/pypy-c /usr/bin/pypy
 	dodoc README.rst
 
 	if ! use gdbm; then
@@ -273,7 +268,7 @@
 	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/$(get_libdir)/pypy/site-packages
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy2.7/site-packages
 	python_export pypy EPYTHON
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die