From e4872e85b2d28d3aca569c741ba8c67cc5942b9c Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sun, 22 Nov 2015 15:39:06 -0800 Subject: [PATCH] kernel-2.eclass: use experimental in global scope Per bug #566520, use experimental is being called in global scope (via detect_version -> handle_genpatches). This should NOT trigger the experimental patches being applied with USE=-experimental, but further testing is needed. X-Gentoo-Bug: #566520 Signed-off-by: Robin H. Johnson --- eclass/kernel-2.eclass | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 1a508f119aaf..c6223238e7f6 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -160,15 +160,9 @@ handle_genpatches() { if [[ "${i}" == "experimental" && -z ${K_EXP_GENPATCHES_PULL} && -z ${K_EXP_GENPATCHES_NOUSE} ]] ; then use_cond_start="experimental? ( " use_cond_end=" )" - - if use experimental ; then - UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}" - debug-print "genpatches tarball: $tarball" - fi - else - UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}" - debug-print "genpatches tarball: $tarball" fi + UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}" + debug-print "genpatches tarball: $tarball" GENPATCHES_URI+=" ${use_cond_start}mirror://gentoo/${tarball}${use_cond_end}" done } -- 2.26.2