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 38A4615808B for ; Mon, 21 Mar 2022 10:06:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31B67E085E; Mon, 21 Mar 2022 10:06:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 C53DCE0827 for ; Mon, 21 Mar 2022 10:06:41 +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 D6695340D67 for ; Mon, 21 Mar 2022 10:06:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DF4732F for ; Mon, 21 Mar 2022 10:06:39 +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: <1647857085.f747303f5f8c53cc2d6566d2c50a500788019db5.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: f747303f5f8c53cc2d6566d2c50a500788019db5 X-VCS-Branch: master Date: Mon, 21 Mar 2022 10:06:39 +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: 53ead2ee-48b8-42df-80af-07b967c8b6e9 X-Archives-Hash: e3170d753fa7c8efe50480bddaad5bb6 commit: f747303f5f8c53cc2d6566d2c50a500788019db5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 27 22:47:33 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 21 10:04:45 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f747303f qt5-build.eclass: Change SLOTing in 5.15.3 - 0 for binary only (user-facing) tools not tied to specific Qt major version - 5 (clean) for binary only/unversioned plugins/files-only/non-private headers - 5/$(ver_cut 1-2) for everything else; unless overridden by ebuild - No change for 5.15.2 ebuilds dev-qt/qtxmlpatterns was added to clean "5" slot because development is dead. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 921f4f27..0a5a7ff3 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -124,7 +124,25 @@ fi : ${QT5_BUILD_DIR:=${S}_build} LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" -SLOT=5/$(ver_cut 1-2) + +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 ;; + *) + SLOT=5/$(ver_cut 1-2) ;; + esac + ;; +esac + IUSE="debug test" if [[ ${QT5_BUILD_TYPE} == release ]]; then