Move cpu-optimation removal. See bug #542810.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index f2a9b66c153b01043bb8157e43dd1c224dfd097a..17605b59859b29e3f11b1f745d49452aeabe94c5 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1568 2015/03/19 09:57:43 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1569 2015/03/20 00:13:32 mpagano Exp $
+
+  20 Mar 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass:
+  Move cpu-optimation removal. See bug #542810
 
   19 Mar 2015; <chewi@gentoo.org> java-pkg-simple.eclass:
   Allow jar to be named something other than ${PN}.jar.

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 4a0e0a6d0b6efebb8cd4db4197b80e706b947506..f7738658e251da1b111728e352c8b40bb4032215 100644 (file)
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.300 2015/02/27 23:44:41 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.301 2015/03/20 00:13:32 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -157,22 +157,11 @@ handle_genpatches() {
                        if use experimental ; then
                                UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
                                debug-print "genpatches tarball: $tarball"
-
-                               # check gcc version < 4.9.X uses patch 5000 and = 4.9.X uses patch 5010                 
-                               if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -ne 9 ]]; then
-                                               # drop 5000_enable-additional-cpu-optimizations-for-gcc-4.9.patch
-                                               UNIPATCH_EXCLUDE+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
-                               else
-                                       #drop 5000_enable-additional-cpu-optimizations-for-gcc.patch
-                                       UNIPATCH_EXCLUDE+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch"
-                               fi
-
                        fi
                else
                        UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
                        debug-print "genpatches tarball: $tarball"
                fi
-
                GENPATCHES_URI+=" ${use_cond_start}mirror://gentoo/${tarball}${use_cond_end}"
        done
 }
@@ -1001,6 +990,22 @@ unipatch() {
                                done
                                UNIPATCH_DROP+=" $(basename ${j})"
                        done
+               else 
+                       UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
+                       debug-print "genpatches tarball: $tarball"
+
+                       # check gcc version < 4.9.X uses patch 5000 and = 4.9.X uses patch 5010                 
+                       if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -ne 9 ]]; then
+                               # drop 5000_enable-additional-cpu-optimizations-for-gcc-4.9.patch
+                               if [[ $UNIPATCH_DROP != *"5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"* ]]; then
+                                       UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
+                               fi
+                       else
+                               if [[ $UNIPATCH_DROP != *"5000_enable-additional-cpu-optimizations-for-gcc.patch"* ]]; then
+                                       #drop 5000_enable-additional-cpu-optimizations-for-gcc.patch
+                                       UNIPATCH_DROP+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch"
+                               fi
+                       fi
                fi
        done