Merge updates from master

9 files changed, 1 insertions, 51 deletions

diff --git a/Documentation/package.accept_keywords/.kde-gear-live/kdemultimedia-live b/Documentation/package.accept_keywords/.kde-gear-live/kdemultimedia-live
index 35bd460080e..abb6c99d7e4 100644
--- a/Documentation/package.accept_keywords/.kde-gear-live/kdemultimedia-live
+++ b/Documentation/package.accept_keywords/.kde-gear-live/kdemultimedia-live
@@ -10,7 +10,6 @@
 ~kde-apps/kwave-9999 **
 ~kde-apps/libkcddb-9999 **
 ~kde-apps/libkcddb-common-9999 **
-~kde-apps/libkcompactdisc-9999 **
 ~media-sound/audex-9999 **
 ~media-sound/elisa-9999 **
 ~media-sound/kasts-9999 **
diff --git a/Documentation/package.accept_keywords/kde-gear-live.keywords b/Documentation/package.accept_keywords/kde-gear-live.keywords
index df04367fbc9..83832c3ff83 100644
--- a/Documentation/package.accept_keywords/kde-gear-live.keywords
+++ b/Documentation/package.accept_keywords/kde-gear-live.keywords
@@ -132,7 +132,6 @@
 ~kde-apps/kwave-9999 **
 ~kde-apps/libkcddb-9999 **
 ~kde-apps/libkcddb-common-9999 **
-~kde-apps/libkcompactdisc-9999 **
 ~media-sound/audex-9999 **
 ~media-sound/elisa-9999 **
 ~media-sound/kasts-9999 **
diff --git a/Documentation/package.mask/kde-gear-live b/Documentation/package.mask/kde-gear-live
index 6346c1f20f8..f698d52c1e9 100644
--- a/Documentation/package.mask/kde-gear-live
+++ b/Documentation/package.mask/kde-gear-live
@@ -121,7 +121,6 @@
 ~kde-apps/kwave-9999
 ~kde-apps/libkcddb-9999
 ~kde-apps/libkcddb-common-9999
-~kde-apps/libkcompactdisc-9999
 ~media-sound/audex-9999
 ~media-sound/elisa-9999
 ~media-sound/kasts-9999
diff --git a/Documentation/package.unmask/kde-gear-live b/Documentation/package.unmask/kde-gear-live
index 6346c1f20f8..f698d52c1e9 100644
--- a/Documentation/package.unmask/kde-gear-live
+++ b/Documentation/package.unmask/kde-gear-live
@@ -121,7 +121,6 @@
 ~kde-apps/kwave-9999
 ~kde-apps/libkcddb-9999
 ~kde-apps/libkcddb-common-9999
-~kde-apps/libkcompactdisc-9999
 ~media-sound/audex-9999
 ~media-sound/elisa-9999
 ~media-sound/kasts-9999
diff --git a/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild b/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
index b0fdffdaae2..c1940fca365 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-9999.ebuild
@@ -19,7 +19,6 @@ IUSE="flac vorbis"
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[widgets]
 	>=kde-apps/libkcddb-${PVCUT}:6
-	>=kde-apps/libkcompactdisc-${PVCUT}:6
 	>=kde-frameworks/kcompletion-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
@@ -28,6 +27,7 @@ DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
 	media-sound/cdparanoia
 	flac? ( >=media-libs/flac-1.1.2:= )
 	vorbis? (
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
index d2ba1823257..4f299181fc8 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 		>=kde-apps/audiocd-kio-${PV}:*
 		>=kde-apps/k3b-${PV}:*
 		>=kde-apps/libkcddb-${PV}:*
-		>=kde-apps/libkcompactdisc-${PV}:*
 	)
 	ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:* )
 	gstreamer? ( >=kde-apps/kamoso-${PV}:* )
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
deleted file mode 100644
index 3808a1bc000..00000000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=6.19.0
-QTMIN=6.9.1
-inherit ecm gear.kde.org
-
-DESCRIPTION="Library for playing & ripping CDs"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="6"
-KEYWORDS=""
-IUSE="alsa"
-
-DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6[dbus]
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	>=media-libs/phonon-4.12.0[qt6(+)]
-	alsa? ( media-libs/alsa-lib )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package alsa ALSA)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/libkcompactdisc/metadata.xml b/kde-apps/libkcompactdisc/metadata.xml
deleted file mode 100644
index c1132e23fef..00000000000
--- a/kde-apps/libkcompactdisc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-		<remote-id type="kde-invent">multimedia/libkcompactdisc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sets/kdemultimedia-live b/sets/kdemultimedia-live
index 506f8f79521..2c669b17d1a 100644
--- a/sets/kdemultimedia-live
+++ b/sets/kdemultimedia-live
@@ -10,7 +10,6 @@
 ~kde-apps/kwave-9999
 ~kde-apps/libkcddb-9999
 ~kde-apps/libkcddb-common-9999
-~kde-apps/libkcompactdisc-9999
 ~media-sound/audex-9999
 ~media-sound/elisa-9999
 ~media-sound/kasts-9999