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 3A6B8158451 for ; Sun, 7 Jan 2024 22:01:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 176502BC067; Sun, 7 Jan 2024 22:01:13 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E48542BC018 for ; Sun, 7 Jan 2024 22:01:12 +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 B59EA3432C8 for ; Sun, 7 Jan 2024 22:01:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F3B41494 for ; Sun, 7 Jan 2024 22:01:10 +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: <1704664437.7d8197615f0a8c26cc427b90bdca912ad3e8e757.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/libkcompactdisc/libkcompactdisc-23.08.49.9999.ebuild kde-apps/libkcompactdisc/metadata.xml X-VCS-Directories: kde-apps/libkcompactdisc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7d8197615f0a8c26cc427b90bdca912ad3e8e757 X-VCS-Branch: master Date: Sun, 7 Jan 2024 22:01:10 +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: 72c2da1e-daea-48e8-96e0-c2206f8c7982 X-Archives-Hash: 577cfe4bfc83a46bd4c112e13aed093d commit: 7d8197615f0a8c26cc427b90bdca912ad3e8e757 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 7 21:52:43 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 7 21:53:57 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d819761 kde-apps/libkcompactdisc: Add IUSE kf6compat Signed-off-by: Andreas Sturmlechner gentoo.org> .../libkcompactdisc/libkcompactdisc-23.08.49.9999.ebuild | 14 ++++++++++++-- kde-apps/libkcompactdisc/metadata.xml | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-23.08.49.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-23.08.49.9999.ebuild index 0f97da84b5..aef5eba758 100644 --- a/kde-apps/libkcompactdisc/libkcompactdisc-23.08.49.9999.ebuild +++ b/kde-apps/libkcompactdisc/libkcompactdisc-23.08.49.9999.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="Library for playing & ripping CDs" LICENSE="GPL-2+ LGPL-2+" SLOT="5" KEYWORDS="" -IUSE="alsa" +IUSE="alsa kf6compat" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -22,7 +22,9 @@ DEPEND=" >=media-libs/phonon-4.11.0[qt5(+)] alsa? ( media-libs/alsa-lib ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + kf6compat? ( kde-apps/libkcompactdisc:6 ) +" src_configure() { local mycmakeargs=( @@ -30,3 +32,11 @@ src_configure() { ) ecm_src_configure } + +src_install() { + ecm_src_install + + if use kf6compat; then + rm -r "${D}"/usr/share/locale || die + fi +} diff --git a/kde-apps/libkcompactdisc/metadata.xml b/kde-apps/libkcompactdisc/metadata.xml index d925f24397..18d53b343a 100644 --- a/kde-apps/libkcompactdisc/metadata.xml +++ b/kde-apps/libkcompactdisc/metadata.xml @@ -7,5 +7,9 @@ https://bugs.kde.org/ + multimedia/libkcompactdisc + + Disable components colliding with KF6, depend on KF6 components instead +