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 13664158094 for ; Tue, 11 Oct 2022 16:21:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A1E3E07B3; Tue, 11 Oct 2022 16:21:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 40148E07B3 for ; Tue, 11 Oct 2022 16:21:57 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66488340FEF for ; Tue, 11 Oct 2022 16:21:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF38655B for ; Tue, 11 Oct 2022 16:21: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: <1665505302.ac12bc48e2ad23d7cb9ddc5e4ce287e1efc94585.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: sys-auth/polkit-qt/ X-VCS-Repository: proj/kde X-VCS-Files: sys-auth/polkit-qt/polkit-qt-9999.ebuild X-VCS-Directories: sys-auth/polkit-qt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ac12bc48e2ad23d7cb9ddc5e4ce287e1efc94585 X-VCS-Branch: master Date: Tue, 11 Oct 2022 16:21: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: 3db8df11-43d1-4257-9f50-ba5750973155 X-Archives-Hash: ffbff17210a4f63c241c64318b0e9c98 commit: ac12bc48e2ad23d7cb9ddc5e4ce287e1efc94585 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 11 16:17:28 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 11 16:21:42 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ac12bc48 sys-auth/polkit-qt: Add IUSE qt6 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-auth/polkit-qt/polkit-qt-9999.ebuild | 40 ++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/sys-auth/polkit-qt/polkit-qt-9999.ebuild b/sys-auth/polkit-qt/polkit-qt-9999.ebuild index a6777dd47d..76b8d6b220 100644 --- a/sys-auth/polkit-qt/polkit-qt-9999.ebuild +++ b/sys-auth/polkit-qt/polkit-qt-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 KDE_ORG_CATEGORY="libraries" KDE_ORG_NAME="polkit-qt-1" -inherit cmake kde.org +inherit cmake kde.org multibuild DESCRIPTION="Qt wrapper around polkit-1 client libraries" HOMEPAGE="https://api.kde.org/polkit-qt-1/html/" @@ -17,24 +17,44 @@ fi LICENSE="LGPL-2" SLOT="0" -IUSE="" +IUSE="+qt5 qt6" +REQUIRED_USE="|| ( qt5 qt6 )" RDEPEND=" dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103 + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + qt6? ( dev-qt/qtbase:6[dbus,gui,widgets] ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" DOCS=( AUTHORS README README.porting TODO ) +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) $(usev qt6) ) +} + src_configure() { - local mycmakeargs=( - -DBUILD_EXAMPLES=OFF - ) - cmake_src_configure + myconfigure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=OFF + -DQT_MAJOR_VERSION=${MULTIBUILD_VARIANT/qt/} + ) + cmake_src_configure + } + multibuild_foreach_variant myconfigure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_install() { + multibuild_foreach_variant cmake_src_install }