From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Sat, 11 Jan 2020 21:34:34 +0000 (+0000)
Subject: toolchain.eclass: allow applying patchsets to live ebuilds
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=447de7a8a31b6878e12033334e0ac19b16a0f6a1;p=gentoo.git

toolchain.eclass: allow applying patchsets to live ebuilds

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

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 64c38828a2eb..5f9bd7750dda 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