commit: 5580fdf0d0a03846328e1c86d1071e4de6405095 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Aug 12 20:35:15 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Aug 15 09:10:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5580fdf0
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 <AT> gentoo.org> eclass/kernel-2.eclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 1b2b5d3e8b6..95011df82d8 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
