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

[Andreas Sturmlechner]

commit:     88b4c5dcd6b8cd0cda9462f154e71a312f6a5fb3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  5 21:52:30 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  8 16:54:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88b4c5dc

qt5-build.eclass: Downpatch version of live to 5.15.2 too

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 eclass/qt5-build.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 0cc45c596b3..a0895e27abd 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -128,13 +128,15 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile 
src_install src_test pkg_
 qt5-build_src_prepare() {
        qt5_prepare_env
 
-       if [[ -n ${KDE_ORG_COMMIT} ]]; then
+       if [[ ${QT5_BUILD_TYPE} == live ]] || [[ -n ${KDE_ORG_COMMIT} ]]; then
                # Upstream bumped version in 5.15 branch after 5.15.2 release 
but their
                # 5.15.3 release is closed and this will never be more than a 
Qt 5.15.2
                # with patches on top.
-               einfo "Preparing KDE Qt5PatchCollection snapshot at 
${KDE_ORG_COMMIT}"
+               if [[ -n ${KDE_ORG_COMMIT} ]]; then
+                       einfo "Preparing KDE Qt5PatchCollection snapshot at 
${KDE_ORG_COMMIT}"
+                       mkdir -p .git || die # need to fake a git repository 
for configure
+               fi
                sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i 
.qmake.conf || die
-               mkdir -p .git || die # need to fake a git repository for 
configure
        fi
 
        if [[ ${QT5_MODULE} == qtbase ]]; then