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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 267BB15808D for ; Mon, 18 Apr 2022 12:48:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AC46E0951; Mon, 18 Apr 2022 12:48:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D42AFE0951 for ; Mon, 18 Apr 2022 12:48:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E310B3414F3 for ; Mon, 18 Apr 2022 12:48:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65239355 for ; Mon, 18 Apr 2022 12:48:54 +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: <1650286078.e95b42d61f7898045b0b9e94a7a20f1dd28f69cd.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: e95b42d61f7898045b0b9e94a7a20f1dd28f69cd X-VCS-Branch: master Date: Mon, 18 Apr 2022 12:48:54 +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: 1f6560e0-605b-42b0-b247-a17e517e69a1 X-Archives-Hash: f27237ee1f8c1a14d319d11c23eece41 commit: e95b42d61f7898045b0b9e94a7a20f1dd28f69cd Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Apr 18 12:27:46 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Apr 18 12:47:58 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e95b42d6 qt5-build.eclass: Drop support for Qt 5.15.2 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 51 ++++++++++--------------------------------------- 1 file 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 \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