From 8f0430fd02ddd519b89daf1b86e799400cf1b2a3 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Mon, 21 Nov 2011 01:43:44 +0000 Subject: [PATCH] Fix live ebuilds. --- eclass/ChangeLog | 5 ++++- eclass/toolchain.eclass | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d63f91df08ed..bd412d605a59 100644 --- 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 toolchain.eclass: + Fix live ebuilds. 19 Nov 2011; Davide Pesavento qt4-build.eclass: Add dependency on dev-util/pkgconfig (#385835 and #387783). diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 0a6ea47bbc4d..7b55ab6fb64b 100644 --- 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 @@ -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 -- 2.26.2