From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
Date: Sat, 9 Dec 2023 10:03:25 +0000 (UTC) [thread overview]
Message-ID: <1702116186.d71eb87ada05dcc8ffb464d91a3f35c03daa4fe6.asturm@gentoo> (raw)
commit: d71eb87ada05dcc8ffb464d91a3f35c03daa4fe6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 09:50:11 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 @@
</maintainer>
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
+ <remote-id type="kde-invent">multimedia/libkcddb</remote-id>
</upstream>
+ <use>
+ <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
+ </use>
</pkgmetadata>
next reply other threads:[~2023-12-09 10:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-09 10:03 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-21 21:47 [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/ Andreas Sturmlechner
2024-08-12 18:57 Andreas Sturmlechner
2024-05-17 15:29 Andreas Sturmlechner
2024-02-25 20:02 Sam James
2023-12-09 11:59 Andreas Sturmlechner
2023-12-09 10:03 Andreas Sturmlechner
2023-03-25 0:15 Andreas Sturmlechner
2020-12-29 16:03 Andreas Sturmlechner
2016-08-31 14:35 Michael Palimaka
2016-08-25 20:03 Michael Palimaka
2016-08-25 20:03 Michael Palimaka
2016-08-18 12:48 Michael Palimaka
2016-07-16 9:19 Johannes Huber
2016-07-15 11:19 Johannes Huber
2016-04-10 9:20 Johannes Huber
2016-04-09 11:42 Christian Schmitt
2016-03-31 18:16 Johannes Huber
2015-10-12 12:46 Michael Palimaka
2014-11-24 17:44 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1702116186.d71eb87ada05dcc8ffb464d91a3f35c03daa4fe6.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox