From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 30 May 2020 20:35:12 +0000 (+0200)
Subject: qt5-build.eclass: Drop obsolete pre-Qt-5.14.2 quirks
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=89ddffa778cd820c43b5ab18bb03e914008b29e4;p=gentoo.git

qt5-build.eclass: Drop obsolete pre-Qt-5.14.2 quirks

Bug: https://bugs.gentoo.org/676948
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index cd2e19b0aa6a..8531d1294f40 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -104,11 +104,7 @@ EGIT_REPO_URI=(
 # @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # Build directory for out-of-source builds.
-if ver_test ${PV} -lt 5.14.2; then
-	: ${QT5_BUILD_DIR:=${S}} # workaround for bug 497312
-else
-	: ${QT5_BUILD_DIR:=${S}_build}
-fi
+: ${QT5_BUILD_DIR:=${S}_build}
 
 IUSE="debug test"
 
@@ -663,9 +659,7 @@ qt5_base_configure() {
 	# config to always be used. bug 599636
 	# ${S}/include does not exist in live sources
 	local basedir="${S}/"
-	if ver_test ${PV} -lt 5.14.2 || [[ ${QT5_BUILD_TYPE} == live ]]; then
-		basedir=""
-	fi
+	[[ ${QT5_BUILD_TYPE} == live ]] && basedir=""
 	cp src/corelib/global/qconfig.h "${basedir}"include/QtCore/ || die
 
 	popd >/dev/null || die