qt5-build.eclass: Drop obsolete <Qt-5.12 conditionals
authorAndreas Sturmlechner <asturm@gentoo.org>
Thu, 6 Jun 2019 20:51:01 +0000 (22:51 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sat, 6 Jul 2019 10:22:48 +0000 (12:22 +0200)
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
eclass/qt5-build.eclass

index 290a0c4038112c73f48862d62f4ed7ec11dff9f0..0e16983478ab6893bfd97b1044a12a1deffe5ea0 100644 (file)
@@ -178,12 +178,6 @@ qt5-build_src_prepare() {
                sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
                        configure || die "sed failed (QMAKE_CONF_COMPILER)"
 
-               if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
-                       # Don't add -O3 to CXXFLAGS (bug 549140)
-                       sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-                               src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
-               fi
-
                # Respect build variables in configure tests (bug #639494)
                sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
        fi
@@ -256,10 +250,6 @@ qt5-build_src_install() {
 
                popd >/dev/null || die
 
-               if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
-                       docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global
-               fi
-
                # install an empty Gentoo/gentoo-qconfig.h in ${D}
                # so that it's placed under package manager control
                > "${T}"/gentoo-qconfig.h
@@ -416,11 +406,7 @@ qt5_prepare_env() {
        QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports
        QT5_QMLDIR=${QT5_ARCHDATADIR}/qml
        QT5_DATADIR=${QT5_PREFIX}/share/qt5
-       if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then
-               QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV}
-       else
-               QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc
-       fi
+       QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc
        QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations
        QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
        QT5_TESTSDIR=${QT5_DATADIR}/tests
@@ -579,8 +565,7 @@ qt5_base_configure() {
                -no-freetype -no-harfbuzz
                -no-openssl -no-libproxy
                -no-xcb-xlib
-               $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev)
-               $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340
+               -no-xcb-xinput -no-xkbcommon # bug 672340
 
                # cannot use -no-gif because there is no way to override it later
                #-no-gif