Fix live ebuilds.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index d63f91df08edfcea17df375e3c0958ecfce2590a..bd412d605a5959220685fd90d0ae80eadecacc40 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.20 2011/11/19 20:52:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.21 2011/11/21 01:43:44 dirtyepic Exp $
+
+  21 Nov 2011; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
+  Fix live ebuilds.
 
   19 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Add dependency on dev-util/pkgconfig (#385835 and #387783).

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 0a6ea47bbc4d5e332374c416cc32ca150f89b0e4..7b55ab6fb64b27f4317bb1269dfb16a2642f101f 100644 (file)
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.480 2011/11/20 20:12:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.481 2011/11/21 01:43:44 dirtyepic Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -933,7 +933,7 @@ toolchain_src_unpack() {
 
        [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && die "Sorry, this version does not support uClibc"
 
-       gcc_quick_unpack
+       [[ -z ${GCC_SVN} ]] && gcc_quick_unpack
        exclude_gcc_patches
 
        cd "${S}"
@@ -995,7 +995,7 @@ toolchain_src_unpack() {
 
        gcc_version_patch
        if [[ ${GCCMAJOR}.${GCCMINOR} > 4.0 ]] ; then
-               if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} ]] ; then
+               if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} || -n ${GCC_SVN} ]] ; then
                        echo ${PV/_/-} > "${S}"/gcc/BASE-VER
                fi
        fi