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

[Sergei Trofimovich]

commit:     447de7a8a31b6878e12033334e0ac19b16a0f6a1
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 21:34:34 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 21:35:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447de7a8

toolchain.eclass: allow applying patchsets to live ebuilds

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 eclass/toolchain.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 64c38828a2e..5f9bd7750dd 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -438,9 +438,9 @@ toolchain_pkg_setup() {
 toolchain_src_unpack() {
        if [[ ${PV} == *9999* ]]; then
                git-r3_src_unpack
-       else
-               gcc_quick_unpack
        fi
+
+       gcc_quick_unpack
 }
 
 gcc_quick_unpack() {
@@ -455,6 +455,8 @@ gcc_quick_unpack() {
        # 'GCC_A_FAKEIT' to specify it's own source and binary tarballs.
        if [[ -n ${GCC_A_FAKEIT} ]] ; then
                unpack ${GCC_A_FAKEIT}
+       elif [[ ${PV} == *9999* ]]; then
+               : # sources comes from git, not tarball
        elif [[ -n ${PRERELEASE} ]] ; then
                unpack gcc-${PRERELEASE}.tar.bz2
        elif [[ -n ${SNAPSHOT} ]] ; then