From: Michał Górny <mgorny@gentoo.org>
Date: Mon, 12 Aug 2019 20:35:15 +0000 (+0200)
Subject: kernel-2.eclass: Inherit python-any-r1 only in deblob branch
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5580fdf0d0a03846328e1c86d1071e4de6405095;p=gentoo.git

kernel-2.eclass: Inherit python-any-r1 only in deblob branch

Closes: https://github.com/gentoo/gentoo/pull/12684
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 1b2b5d3e8b60..95011df82d87 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -191,9 +191,7 @@
 # If you do change them, there is a chance that we will not fix resulting bugs;
 # that of course does not mean we're not willing to help.
 
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit toolchain-funcs python-any-r1
+inherit toolchain-funcs
 [[ ${EAPI:-0} == [012345] ]] && inherit epatch
 [[ ${EAPI:-0} == [0123456] ]] && inherit estack eapi7-ver
 case ${EAPI:-0} in
@@ -621,6 +619,10 @@ if [[ ${ETYPE} == sources ]]; then
 				kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \
 					K_DEBLOB_AVAILABLE=1
 		if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then
+			PYTHON_COMPAT=( python2_7 )
+
+			inherit python-any-r1
+
 			IUSE="${IUSE} deblob"
 
 			# Reflect that kernels contain firmware blobs unless otherwise