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 3507D1382C5 for ; Fri, 26 Jan 2018 00:02:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E0B4E08DF; Fri, 26 Jan 2018 00:02:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 4C13CE08DF for ; Fri, 26 Jan 2018 00:02:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D22E6335C2E for ; Fri, 26 Jan 2018 00:02:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F41DD1C6 for ; Fri, 26 Jan 2018 00:02:14 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1516924926.eddf34bccd6cbd6f4504b08fc6255d24a1e69375.kensington@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: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: eddf34bccd6cbd6f4504b08fc6255d24a1e69375 X-VCS-Branch: master Date: Fri, 26 Jan 2018 00:02:14 +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-Archives-Salt: 755d0cf2-76a0-4beb-be6f-5dded16dbbb0 X-Archives-Hash: 0406c5762bd4016570cd52779b2fa234 commit: eddf34bccd6cbd6f4504b08fc6255d24a1e69375 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jan 25 23:59:46 2018 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Fri Jan 26 00:02:06 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=eddf34bc qt5-build.eclass: relax qconfig-qtcore.pri insertion to all 5.9 and later Previously, the check was too restrictive and would not match, for example, 5.10.0. There's no real reason to exclude earlier versions of 5.9 as they're not currently stable so for simplicity fix this by just dropping the extra check. eclass/qt5-build.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index bc477889..25d4136c 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -804,7 +804,7 @@ qt5_install_module_qconfigs() { doins "${T}"/${PN}-qconfig.pri ) - if [[ ${PN} = qtcore && ${QT5_MINOR_VERSION} -ge 9 && ${QT5_PATCH_VERSION} -ge 4 ]]; then + if [[ ${PN} = qtcore && ${QT5_MINOR_VERSION} -ge 9 ]]; then insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri fi