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 E4C3E158013 for ; Tue, 12 Dec 2023 18:58:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 372712BC026; Tue, 12 Dec 2023 18:58:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 1AC352BC026 for ; Tue, 12 Dec 2023 18:58:31 +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 2BBEA335D6A for ; Tue, 12 Dec 2023 18:58:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A6AF136E for ; Tue, 12 Dec 2023 18:58:28 +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: <1702407487.d2b9ed3bc147249e8f1063285d869b3555c9fd20.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-integration/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-integration/plasma-integration-9999.ebuild X-VCS-Directories: kde-plasma/plasma-integration/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d2b9ed3bc147249e8f1063285d869b3555c9fd20 X-VCS-Branch: master Date: Tue, 12 Dec 2023 18:58:28 +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: 9c31131b-b367-4da9-bedb-b74c954d75d8 X-Archives-Hash: d1aee09eb171b1535e06221d6360fd1a commit: d2b9ed3bc147249e8f1063285d869b3555c9fd20 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 12 18:43:06 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 12 18:58:07 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d2b9ed3b kde-plasma/plasma-integration: Add IUSE qt5, update dependencies Upstream commits: c42f6f220c29fe1dfba6f5bf86fcdfe4540ed9a7 fbe7c3e844ea168f8a68893d6f2c7e3e79ce0fdb 1f6a4d44814201317c1febd70c04e7f994088810 945bf9e47946264f88b8770dfa7bca67dc2a868a 6e0ecb6b7b070f54bb223a1b3d1e3ef6eaceea07 ca195f4737215f060c92f30e05d9ebe02cf6ca98 Closes: https://bugs.gentoo.org/919680 Signed-off-by: Andreas Sturmlechner gentoo.org> .../plasma-integration-9999.ebuild | 45 +++++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild index 3de25e070a..98d27eeb3f 100644 --- a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild +++ b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild @@ -3,8 +3,10 @@ EAPI=8 +KF5MIN=5.106.0 KFMIN=5.245.0 PVCUT=$(ver_cut 1-3) +QT5MIN=5.15.9 QTMIN=6.6.0 inherit ecm plasma.kde.org @@ -13,7 +15,7 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" LICENSE="LGPL-2+" SLOT="6" KEYWORDS="" -IUSE="" +IUSE="qt5" # requires running kde environment RESTRICT="test" @@ -23,22 +25,41 @@ COMMON_DEPEND=" >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 >=kde-frameworks/kcompletion-${KFMIN}:6 >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kiconthemes-${KFMIN}:6 >=kde-frameworks/kio-${KFMIN}:6 >=kde-frameworks/kjobwidgets-${KFMIN}:6 >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-plasma/breeze-${PVCUT}:6 - >=kde-plasma/kwayland-${PVCUT}:6 x11-libs/libXcursor x11-libs/libxcb + qt5? ( + >=dev-qt/qtdbus-${QT5MIN}:5 + >=dev-qt/qtgui-${QT5MIN}:5=[dbus] + >=dev-qt/qtquickcontrols2-${QT5MIN}:5 + >=dev-qt/qtwayland-${QT5MIN}:5 + >=dev-qt/qtwidgets-${QT5MIN}:5 + >=dev-qt/qtx11extras-${QT5MIN}:5 + >=kde-frameworks/kcompletion-${KF5MIN}:5 + >=kde-frameworks/kconfig-${KF5MIN}:5 + >=kde-frameworks/kconfigwidgets-${KF5MIN}:5 + >=kde-frameworks/kcoreaddons-${KF5MIN}:5 + >=kde-frameworks/kguiaddons-${KF5MIN}:5 + >=kde-frameworks/ki18n-${KF5MIN}:5 + >=kde-frameworks/kiconthemes-${KF5MIN}:5 + >=kde-frameworks/kio-${KF5MIN}:5 + >=kde-frameworks/kjobwidgets-${KF5MIN}:5 + >=kde-frameworks/knotifications-${KF5MIN}:5 + >=kde-frameworks/kwindowsystem-${KF5MIN}:5 + >=kde-frameworks/kxmlgui-${KF5MIN}:5 + ) " DEPEND="${COMMON_DEPEND} >=dev-libs/plasma-wayland-protocols-1.11.1 @@ -47,5 +68,17 @@ RDEPEND="${COMMON_DEPEND} >=kde-plasma/xdg-desktop-portal-kde-${PVCUT}:6 media-fonts/hack media-fonts/noto + media-fonts/noto-emoji " -BDEPEND=">=dev-qt/qtwayland-${QTMIN}:6" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + qt5? ( >=dev-qt/qtwaylandscanner-${QT5MIN}:5 ) +" + +src_configure() { + local mycmakeargs=( + -DBUILD_QT6=ON + -DBUILD_QT5=$(usex qt5) + ) + ecm_src_configure +}