qt5-build.eclass: Drop obsolete pre-Qt-5.14.2 quirks
authorAndreas Sturmlechner <asturm@gentoo.org>
Sat, 30 May 2020 20:35:12 +0000 (22:35 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sat, 30 May 2020 20:46:00 +0000 (22:46 +0200)
Bug: https://bugs.gentoo.org/676948
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
eclass/qt5-build.eclass

index cd2e19b0aa6acb4a42216190af135fec6de47d26..8531d1294f4069c8c9f400d927e9d08e66f1cbcc 100644 (file)
@@ -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