diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-04-18 14:27:46 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-04-18 14:47:58 +0200 |
| commit | e95b42d61f7898045b0b9e94a7a20f1dd28f69cd (patch) | |
| tree | 3b4fcba45e5a35544a6d806da1ad7ccacdabb4cb /eclass | |
| parent | dev-qt/qtwebsockets: add version 6.9999 (diff) | |
| download | qt-e95b42d61f7898045b0b9e94a7a20f1dd28f69cd.tar.gz qt-e95b42d61f7898045b0b9e94a7a20f1dd28f69cd.tar.bz2 qt-e95b42d61f7898045b0b9e94a7a20f1dd28f69cd.zip | |
qt5-build.eclass: Drop support for Qt 5.15.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 51 |
1 files changed, 10 insertions, 41 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 3c8f92f9..6da97387 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -97,10 +97,8 @@ inherit estack flag-o-matic toolchain-funcs virtualx if [[ ${PN} != qtwebengine ]]; then case ${PV} in - 5.15.2* | *9999 ) - # kde/5.15 branch or Qt5PatchCollection based on Qt 5.15.2 - # (using KDE_ORG_COMMIT) - inherit kde.org + *9999 ) + inherit kde.org # kde/5.15 branch ;; 5.15.[3-9]* ) # official stable release @@ -125,22 +123,15 @@ fi LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" -case ${PV} in - 5.15.2*) - SLOT=5/$(ver_cut 1-2) - ;; +case ${PN} in + assistant|linguist|qdbus|qdbusviewer|pixeltool) + SLOT=0 ;; + linguist-tools|qdoc|qtdiag|qtgraphicaleffects|qtimageformats| \ + qtpaths|qtplugininfo|qtquickcontrols|qtquicktimeline| \ + qttranslations|qtwaylandscanner|qtxmlpatterns) + SLOT=5 ;; *) - case ${PN} in - assistant|linguist|qdbus|qdbusviewer|pixeltool) - SLOT=0 ;; - linguist-tools|qdoc|qtdiag|qtgraphicaleffects|qtimageformats| \ - qtpaths|qtplugininfo|qtquickcontrols|qtquicktimeline| \ - qttranslations|qtwaylandscanner|qtxmlpatterns) - SLOT=5 ;; - *) - SLOT=5/$(ver_cut 1-2) ;; - esac - ;; + SLOT=5/$(ver_cut 1-2) ;; esac IUSE="debug test" @@ -174,10 +165,6 @@ qt5-build_src_prepare() { einfo "Preparing KDE Qt5PatchCollection snapshot at ${KDE_ORG_COMMIT}" mkdir -p .git || die # need to fake a git repository for configure fi - # Ensure our ${QT5_PV} is not contradicted by any upstream (Qt) commit - # bumping version in 5.15 branch after release (probably can be dropped - # after 5.15.2_p* are gone) - sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die fi if [[ ${QT5_MODULE} == qtbase ]]; then @@ -289,24 +276,6 @@ qt5-build_src_install() { sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \ "${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \ || die "sed failed (qconfig.h)" - - if ver_test -lt 5.15.2-r10; 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 |