commit: dcf4883249bd38dcec81d93ae22ab899eae7f1db
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 2 13:57:16 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
