diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-07-02 15:57:16 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-12-27 02:32:23 +0100 |
| commit | dcf4883249bd38dcec81d93ae22ab899eae7f1db (patch) | |
| tree | e5928034e964de29ff5ec0244ab6ae78d365e4c0 /eclass | |
| parent | dev-qt/qtdeclarative: python3_9 (diff) | |
| download | qt-dcf4883249bd38dcec81d93ae22ab899eae7f1db.tar.gz qt-dcf4883249bd38dcec81d93ae22ab899eae7f1db.tar.bz2 qt-dcf4883249bd38dcec81d93ae22ab899eae7f1db.zip | |
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 <asturm@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 40 |
1 files 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 |