From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A6DD1382C5 for ; Mon, 1 Jun 2020 23:41:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1354EE0845; Mon, 1 Jun 2020 23:41:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86D03E0845 for ; Mon, 1 Jun 2020 23:41:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0ECD034F072 for ; Mon, 1 Jun 2020 23:41:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D47211C8 for ; Mon, 1 Jun 2020 23:41:38 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1591001414.c5a8bc30c940374a54bac471f8c116c14448c9cf.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c5a8bc30c940374a54bac471f8c116c14448c9cf X-VCS-Branch: master Date: Mon, 1 Jun 2020 23:41:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f675fad8-d5cc-4d10-8890-1decc613c5ae X-Archives-Hash: 862c3e18983d2d52761669c59ccf2941 commit: c5a8bc30c940374a54bac471f8c116c14448c9cf Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 30 20:35:12 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jun 1 08:50:14 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c5a8bc30 qt5-build.eclass: Drop obsolete pre-Qt-5.14.2 quirks Bug: https://bugs.gentoo.org/676948 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index cd2e19b0..8531d129 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