summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-05-30 22:35:12 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-05-30 22:46:00 +0200
commit89ddffa778cd820c43b5ab18bb03e914008b29e4 (patch)
tree187301fb014f1006c3739421c3988644e90eac7c /eclass
parentdev-qt: Drop Qt 5.14.1 and vulnerable dev-qt/qtgui (diff)
downloadgentoo-89ddffa778cd820c43b5ab18bb03e914008b29e4.tar.gz
gentoo-89ddffa778cd820c43b5ab18bb03e914008b29e4.tar.bz2
gentoo-89ddffa778cd820c43b5ab18bb03e914008b29e4.zip
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>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/qt5-build.eclass10
1 files changed, 2 insertions, 8 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index cd2e19b0aa6..8531d1294f4 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