From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 13 Jun 2020 10:39:22 +0100
Subject: gentoo resync : 13.06.2020

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

(limited to 'eclass/qt5-build.eclass')

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
-- 
cgit v1.2.3