From: Michael Palimaka <kensington@gentoo.org>
Date: Thu, 1 Dec 2016 18:02:53 +0000 (+1100)
Subject: qt5-build.eclass: fix avoiding qmake recompilation for Qt 5.8 and later
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=94f2b4eba3289fc2bebcd90260767a5e3b493d3f;p=gentoo.git

qt5-build.eclass: fix avoiding qmake recompilation for Qt 5.8 and later

See qtbase commit 4ce0beee1b69a8695fc24a244a8a3053711906ac.
---

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a627ce882a49..62c79d096285 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -172,8 +172,14 @@ qt5-build_src_prepare() {
 		qt5_symlink_tools_to_build_dir
 
 		# Avoid unnecessary qmake recompilations
-		sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
-			configure || die "sed failed (skip qmake bootstrap)"
+		if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
+			sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \
+				-e '/echo "Done."/a fi' \
+				configure || die "sed failed (skip qmake bootstrap)"
+		else
+			sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
+				configure || die "sed failed (skip qmake bootstrap)"
+		fi
 
 		# Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake
 		sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \