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 18544158015 for ; Tue, 19 Dec 2023 22:01:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D58692BC01F; Tue, 19 Dec 2023 22:01:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 B847A2BC01F for ; Tue, 19 Dec 2023 22:01:01 +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 D969134027D for ; Tue, 19 Dec 2023 22:01:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2968612F5 for ; Tue, 19 Dec 2023 22:00:59 +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: <1703021883.8d2ed19804df1fca7c2384299cddaa1ca2430ea2.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kaccounts-integration/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild X-VCS-Directories: kde-apps/kaccounts-integration/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8d2ed19804df1fca7c2384299cddaa1ca2430ea2 X-VCS-Branch: master Date: Tue, 19 Dec 2023 22:00:59 +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: 904759b2-b955-4d26-b06b-eecc85297941 X-Archives-Hash: 692d65b8adfcccf37642d66095adcb78 commit: 8d2ed19804df1fca7c2384299cddaa1ca2430ea2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 19 21:38:03 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 19 21:38:03 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8d2ed198 kde-apps/kaccounts-integration: Add IUSE qt5 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kaccounts-integration-9999.ebuild | 55 ++++++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild index f9bb76b5e2..d0fe2fa698 100644 --- a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild +++ b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild @@ -4,10 +4,12 @@ EAPI=8 ECM_TEST="forceoptional" +KF5MIN=5.106.0 KFMIN=5.246.0 +QT5MIN=5.15.9 QTMIN=6.6.0 VIRTUALDBUS_TEST="true" -inherit ecm gear.kde.org +inherit ecm gear.kde.org multibuild DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop" HOMEPAGE="https://community.kde.org/KTp" @@ -15,7 +17,7 @@ HOMEPAGE="https://community.kde.org/KTp" LICENSE="LGPL-2.1" SLOT="6" KEYWORDS="" -IUSE="" +IUSE="qt5" # bug #549444 RESTRICT="test" @@ -31,13 +33,29 @@ COMMON_DEPEND=" >=kde-frameworks/kio-${KFMIN}:6 >=kde-frameworks/kpackage-${KFMIN}:6 >=kde-frameworks/kwallet-${KFMIN}:6 - >=net-libs/accounts-qt-1.16-r1[qt6] - >=net-libs/signond-8.61-r1[qt6] + >=net-libs/accounts-qt-1.16-r1[qt5?,qt6] + >=net-libs/signond-8.61-r1[qt5?,qt6] + qt5? ( + >=dev-qt/qtdeclarative-${QT5MIN}:5 + >=dev-qt/qtgui-${QT5MIN}:5 + >=dev-qt/qtwidgets-${QT5MIN}:5 + >=kde-frameworks/kconfig-${KF5MIN}:5 + >=kde-frameworks/kcoreaddons-${KF5MIN}:5 + >=kde-frameworks/kdbusaddons-${KF5MIN}:5 + >=kde-frameworks/kdeclarative-${KF5MIN}:5 + >=kde-frameworks/ki18n-${KF5MIN}:5 + >=kde-frameworks/kio-${KF5MIN}:5 + >=kde-frameworks/kwallet-${KF5MIN}:5 + ) " DEPEND="${COMMON_DEPEND} dev-libs/qcoro >=kde-frameworks/kcmutils-${KFMIN}:6 kde-plasma/kde-cli-tools:* + qt5? ( + dev-libs/qcoro5 + >=kde-frameworks/kcmutils-${KF5MIN}:5 + ) " # KAccountsMacros.cmake needs intltool RDEPEND="${COMMON_DEPEND} @@ -46,4 +64,33 @@ RDEPEND="${COMMON_DEPEND} BDEPEND=" >=kde-frameworks/kpackage-${KFMIN}:6 sys-devel/gettext + qt5? ( >=kde-frameworks/kpackage-${KF5MIN}:5 ) " + +pkg_setup() { + MULTIBUILD_VARIANTS=( $(usev qt5) default ) +} + +src_configure() { + my_src_configure() { + if [[ ${MULTIBUILD_VARIANT} == qt5 ]]; then + local mycmakeargs=( -DKF6_COMPAT_BUILD=ON ) + fi + + ecm_src_configure + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_test() { + multibuild_foreach_variant ecm_src_test +} + +src_install() { + multibuild_foreach_variant ecm_src_install +}