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 8127415834D for ; Mon, 1 Jul 2024 21:06:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB3DAE2BE2; Mon, 1 Jul 2024 21:06:40 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3F16E2C53 for ; Mon, 1 Jul 2024 21:06:40 +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 B98E734302A for ; Mon, 1 Jul 2024 21:06:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 088871DB4 for ; Mon, 1 Jul 2024 21:06:37 +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: <1719867924.083dfae3303382a457b71c6fc6f6364178655b25.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/purpose/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/purpose/metadata.xml kde-frameworks/purpose/purpose-5.116.0-r1.ebuild kde-frameworks/purpose/purpose-5.116.0.ebuild kde-frameworks/purpose/purpose-6.3.0-r1.ebuild kde-frameworks/purpose/purpose-6.3.0.ebuild X-VCS-Directories: kde-frameworks/purpose/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 083dfae3303382a457b71c6fc6f6364178655b25 X-VCS-Branch: master Date: Mon, 1 Jul 2024 21:06:37 +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: d4e13cee-c54c-4be7-8659-826ef6320ee1 X-Archives-Hash: fb88bdac3b9da42bc82762c9bc27c935 commit: 083dfae3303382a457b71c6fc6f6364178655b25 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 30 10:23:34 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jul 1 21:05:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=083dfae3 kde-frameworks/purpose: Rename IUSE kaccounts -> webengine kde-apps/kaccounts-integration inevitably pulls in -providers which pulls in dev-qt/qtwebengine. Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/purpose/metadata.xml | 1 + .../{purpose-5.116.0.ebuild => purpose-5.116.0-r1.ebuild} | 2 +- .../purpose/{purpose-6.3.0.ebuild => purpose-6.3.0-r1.ebuild} | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/kde-frameworks/purpose/metadata.xml b/kde-frameworks/purpose/metadata.xml index 6b0d501b777f..70fcb363554b 100644 --- a/kde-frameworks/purpose/metadata.xml +++ b/kde-frameworks/purpose/metadata.xml @@ -11,6 +11,7 @@ Enable support for system-wide defined KAccounts Disable components colliding with KF6, depend on KF6 components instead + Enable support for system-wide defined KAccounts diff --git a/kde-frameworks/purpose/purpose-5.116.0.ebuild b/kde-frameworks/purpose/purpose-5.116.0-r1.ebuild similarity index 96% rename from kde-frameworks/purpose/purpose-5.116.0.ebuild rename to kde-frameworks/purpose/purpose-5.116.0-r1.ebuild index 608b515dc68e..9f3b9e96d6dd 100644 --- a/kde-frameworks/purpose/purpose-5.116.0.ebuild +++ b/kde-frameworks/purpose/purpose-5.116.0-r1.ebuild @@ -40,7 +40,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - kf6compat? ( kde-frameworks/purpose:6[kaccounts?] ) + kf6compat? ( kaccounts? ( >=kde-frameworks/purpose-6.3.0-r1:6[webengine] ) ) >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kdeclarative-${PVCUT}:5 diff --git a/kde-frameworks/purpose/purpose-6.3.0.ebuild b/kde-frameworks/purpose/purpose-6.3.0-r1.ebuild similarity index 88% rename from kde-frameworks/purpose/purpose-6.3.0.ebuild rename to kde-frameworks/purpose/purpose-6.3.0-r1.ebuild index 5fc42a4bd896..5a87ee551fe4 100644 --- a/kde-frameworks/purpose/purpose-6.3.0.ebuild +++ b/kde-frameworks/purpose/purpose-6.3.0-r1.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Library for providing abstractions to get the developer's purposes LICENSE="LGPL-2.1+" KEYWORDS="~amd64 ~arm64" -IUSE="bluetooth kaccounts" +IUSE="bluetooth webengine" # requires running environment RESTRICT="test" @@ -29,7 +29,7 @@ DEPEND=" =kde-frameworks/knotifications-${PVCUT}*:6 =kde-frameworks/kservice-${PVCUT}*:6 =kde-frameworks/prison-${PVCUT}*:6 - kaccounts? ( + webengine? ( kde-apps/kaccounts-integration:6 >=net-libs/accounts-qt-1.16_p20220803[qt6] ) @@ -38,9 +38,9 @@ RDEPEND="${DEPEND} !${CATEGORY}/${PN}:5[-kf6compat(-)] >=kde-frameworks/kdeclarative-${PVCUT}:6 bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:6 ) - kaccounts? ( >=net-libs/accounts-qml-0.7_p20231028[qt6] ) + webengine? ( >=net-libs/accounts-qml-0.7_p20231028[qt6] ) " -BDEPEND="kaccounts? ( dev-util/intltool )" +BDEPEND="webengine? ( dev-util/intltool )" src_prepare() { ecm_src_prepare @@ -51,7 +51,7 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(cmake_use_find_package kaccounts KAccounts6) + $(cmake_use_find_package webengine KAccounts6) ) ecm_src_configure