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 173B6158016 for ; Sat, 9 Dec 2023 10:03:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C7562BC02A; Sat, 9 Dec 2023 10:03:29 +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 3F6B02BC02A for ; Sat, 9 Dec 2023 10:03:29 +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 58C51340821 for ; Sat, 9 Dec 2023 10:03:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6E6B1497 for ; Sat, 9 Dec 2023 10:03:25 +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: <1702116186.d71eb87ada05dcc8ffb464d91a3f35c03daa4fe6.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/libkcddb/libkcddb-23.08.49.9999.ebuild kde-apps/libkcddb/metadata.xml X-VCS-Directories: kde-apps/libkcddb/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d71eb87ada05dcc8ffb464d91a3f35c03daa4fe6 X-VCS-Branch: master Date: Sat, 9 Dec 2023 10:03:25 +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: 922a59df-952b-4cba-8370-ba42f2109d10 X-Archives-Hash: 7ba1fa1787456d7624912c192bbcee0e commit: d71eb87ada05dcc8ffb464d91a3f35c03daa4fe6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 9 09:50:11 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 9 10:03:06 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d71eb87a kde-apps/libkcddb: Add IUSE kf6compat Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/libkcddb/libkcddb-23.08.49.9999.ebuild | 19 +++++++++++++++++-- kde-apps/libkcddb/metadata.xml | 4 ++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/kde-apps/libkcddb/libkcddb-23.08.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-23.08.49.9999.ebuild index 7e422a3f0f..b11d400df2 100644 --- a/kde-apps/libkcddb/libkcddb-23.08.49.9999.ebuild +++ b/kde-apps/libkcddb/libkcddb-23.08.49.9999.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="KDE library for CDDB" LICENSE="GPL-2+ handbook? ( FDL-1.2 )" SLOT="5" KEYWORDS="" -IUSE="musicbrainz" +IUSE="musicbrainz kf6compat" # tests require network access and compare static data with online data # bug 280996 @@ -32,7 +32,9 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 musicbrainz? ( media-libs/musicbrainz:5 ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + kf6compat? ( kde-apps/libkcddb:6 ) +" BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" src_prepare() { @@ -47,3 +49,16 @@ src_configure() { ecm_src_configure } + +src_install() { + ecm_src_install + + if use kf6compat; then + rm "${D}"/usr/share/applications/kcm_cddb.desktop \ + "${D}"/usr/share/config.kcfg/libkcddb5.kcfg || die + if use handbook; then + rm -r "${D}"/usr/share/help || die + fi + rm -r "${D}"/usr/share/locale || die + fi +} diff --git a/kde-apps/libkcddb/metadata.xml b/kde-apps/libkcddb/metadata.xml index d925f24397..3180280914 100644 --- a/kde-apps/libkcddb/metadata.xml +++ b/kde-apps/libkcddb/metadata.xml @@ -7,5 +7,9 @@ https://bugs.kde.org/ + multimedia/libkcddb + + Disable components colliding with KF6, depend on KF6 components instead +