From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1576025-garchives=archives.gentoo.org@lists.gentoo.org>
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 057DF158013
for <garchives@archives.gentoo.org>; Sat, 2 Dec 2023 19:25:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B22A42BC027;
Sat, 2 Dec 2023 19:25:07 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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 984382BC027
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Dec 2023 19:25:07 +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 6833B335D75
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Dec 2023 19:25:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C0359145C
for <gentoo-commits@lists.gentoo.org>; Sat, 2 Dec 2023 19:25:03 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1701543883.b8b557f5d6f536ae9d79152ba5c7ea75c0a60bd1.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/purpose/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-frameworks/purpose/metadata.xml kde-frameworks/purpose/purpose-5.239.9999.ebuild
X-VCS-Directories: kde-frameworks/purpose/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: b8b557f5d6f536ae9d79152ba5c7ea75c0a60bd1
X-VCS-Branch: master
Date: Sat, 2 Dec 2023 19:25:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d6dc4896-8d19-4137-b23c-3b9474dec6ca
X-Archives-Hash: cca858f1688e564592f579461f98fd3c
commit: b8b557f5d6f536ae9d79152ba5c7ea75c0a60bd1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 19:04:43 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 19:04:43 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b8b557f5
kde-frameworks/purpose: Add IUSE=kf6compat
Removes colliding hicolor icons.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/purpose/metadata.xml | 1 +
kde-frameworks/purpose/purpose-5.239.9999.ebuild | 13 ++++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/kde-frameworks/purpose/metadata.xml b/kde-frameworks/purpose/metadata.xml
index 94150564ce..6b0d501b77 100644
--- a/kde-frameworks/purpose/metadata.xml
+++ b/kde-frameworks/purpose/metadata.xml
@@ -10,6 +10,7 @@
</upstream>
<use>
<flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
+ <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
</use>
<slots>
<subslots>
diff --git a/kde-frameworks/purpose/purpose-5.239.9999.ebuild b/kde-frameworks/purpose/purpose-5.239.9999.ebuild
index 3c911a4667..3a740499ce 100644
--- a/kde-frameworks/purpose/purpose-5.239.9999.ebuild
+++ b/kde-frameworks/purpose/purpose-5.239.9999.ebuild
@@ -12,7 +12,7 @@ inherit ecm frameworks.kde.org optfeature xdg-utils
DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled"
LICENSE="LGPL-2.1+"
KEYWORDS=""
-IUSE="bluetooth +kaccounts"
+IUSE="bluetooth +kaccounts kf6compat"
# requires running environment
RESTRICT="test"
@@ -37,6 +37,7 @@ DEPEND="
)
"
RDEPEND="${DEPEND}
+ kf6compat? ( kde-frameworks/purpose:6 )
>=dev-qt/qtquickcontrols-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=kde-frameworks/kdeclarative-${PVCUT}:5
@@ -59,6 +60,16 @@ src_configure() {
ecm_src_configure
}
+src_install() {
+ ecm_src_install
+
+ if use kf6compat; then
+ rm "${D}"/usr/share/icons/hicolor/128x128/apps/{reviewboard,phabricator}-purpose.png \
+ "${D}"/usr/share/icons/hicolor/16x16/apps/{reviewboard,phabricator}-purpose.png \
+ || die
+ fi
+}
+
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
optfeature "Send through KDE Connect" kde-misc/kdeconnect