[gentoo-commits] repo/gentoo:master commit in: eclass/

[Robin H. Johnson]

commit:     e4872e85b2d28d3aca569c741ba8c67cc5942b9c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 23:39:06 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 23:40:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4872e85

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 <robbat2 <AT> gentoo.org>

 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 1a508f1..c622323 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
 }