[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/

[Patrick McLean]

commit:     8f4fa093b0da0b3781bb84cadbb0e723bc3db958
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  2 17:37:04 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sun Aug  2 17:37:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4fa093

sys-process/criu-3.14-r1: Don't install python2.7 code (bug 723872)

Closes: https://bugs.gentoo.org/723872
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 sys-process/criu/{criu-3.14.ebuild => criu-3.14-r1.ebuild} | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-process/criu/criu-3.14.ebuild b/sys-process/criu/criu-3.14-r1.ebuild
similarity index 94%
rename from sys-process/criu/criu-3.14.ebuild
rename to sys-process/criu/criu-3.14-r1.ebuild
index 9ffb3cc47e9..c9f8ef9a81c 100644
--- a/sys-process/criu/criu-3.14.ebuild
+++ b/sys-process/criu/criu-3.14-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit toolchain-funcs linux-info flag-o-matic python-r1
 
@@ -75,6 +75,7 @@ src_configure() {
 	# Gold linker generates invalid object file when used with criu's custom
 	# linker script.  Use the bfd linker instead. See https://crbug.com/839665#c3
 	tc-ld-disable-gold
+	python_setup
 }
 
 src_compile() {
@@ -84,6 +85,8 @@ src_compile() {
 		CC="$(tc-getCC)" \
 		LD="$(tc-getLD)" \
 		AR="$(tc-getAR)" \
+		PYTHON="${EPYTHON%.?}" \
+		FULL_PYTHON="${PYTHON%.?}" \
 		OBJCOPY="$(tc-getOBJCOPY)" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		ARCH="$(criu_arch)" \
@@ -109,6 +112,8 @@ src_install() {
 	emake \
 		ARCH="$(criu_arch)" \
 		PREFIX="${EPREFIX}"/usr \
+		PYTHON="${EPYTHON%.?}" \
+		FULL_PYTHON="${PYTHON%.?}" \
 		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
 		DESTDIR="${D}" \
 		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \