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 20E771382C5 for ; Mon, 28 Dec 2020 09:50:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3555AE0E20; Mon, 28 Dec 2020 09:49:59 +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 1D144E0E20 for ; Mon, 28 Dec 2020 09:49:59 +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 EE2713413A4 for ; Mon, 28 Dec 2020 09:49:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E1D9CC for ; Mon, 28 Dec 2020 09:49:56 +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: <1609032743.dcf4883249bd38dcec81d93ae22ab899eae7f1db.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: dcf4883249bd38dcec81d93ae22ab899eae7f1db X-VCS-Branch: master Date: Mon, 28 Dec 2020 09:49:56 +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: 85261628-f610-4e7c-96df-39ff1eb82400 X-Archives-Hash: fe655ff8e645e963d89ca812fc724e1a commit: dcf4883249bd38dcec81d93ae22ab899eae7f1db Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jul 2 13:57:16 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 27 01:32:23 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=dcf48832 qt5-build.eclass: Limit RDEPEND on qtchooser to Qt versions <5.15.2 Install qtchooser configuration only for <=dev-qt/qtcore-5.15.2-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index ad7f6a64..503d0c3f 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -112,10 +112,9 @@ BDEPEND=" if [[ ${PN} != qttest ]]; then DEPEND+=" test? ( ~dev-qt/qttest-${PV} )" fi -RDEPEND=" - dev-qt/qtchooser -" - +if ver_test -lt 5.15.2; then + RDEPEND+=" dev-qt/qtchooser" +fi ###### Phase functions ###### @@ -258,22 +257,23 @@ qt5-build_src_install() { "${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \ || die "sed failed (qconfig.h)" - # install qtchooser configuration file - cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die - ${QT5_BINDIR} - ${QT5_LIBDIR} - _EOF_ - - ( - insinto /etc/xdg/qtchooser - doins "${T}/qt5-${CHOST}.conf" - ) - - # convenience symlinks - dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf - dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf - # TODO bug 522646: write an eselect module to manage default.conf - dosym qt5.conf /etc/xdg/qtchooser/default.conf + if ver_test -lt 5.15.2-r2; then + # install qtchooser configuration file + cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die + ${QT5_BINDIR} + ${QT5_LIBDIR} + _EOF_ + + ( + insinto /etc/xdg/qtchooser + doins "${T}/qt5-${CHOST}.conf" + ) + + # convenience symlinks + dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf + dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf + dosym qt5.conf /etc/xdg/qtchooser/default.conf + fi fi qt5_install_module_config