gentoo auto-resync : 15:02:2024 - 23:36:26

4 files changed, 121 insertions, 1 deletions

diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 1d511e1dbd20..1d9390b0e766 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,3 +1,7 @@
 DIST libkcddb-23.08.4.tar.xz 451368 BLAKE2B 6991787c132735dff221404a950fde63c1daad7e2e5d2f5aaf1fa9c096d098279bf890e745a57c7c96252e627c1b94066c62eace8f276e8552f44eea90d39612 SHA512 934e1b1ea1ff709cfd088f07a7f443fd33126d382c38aaeed4a37c0f339aceb9fa3b2585e00f3dd96ab731a3e2f43cec8b657605c383daec7cb0a54d86e7d021
+DIST libkcddb-23.08.5.tar.xz 451388 BLAKE2B 2c6118d0f9f263d45226005340d66c99b32171459ad2f744b788b3d88f714546b99421251422fae6296b97fbcb3523ee12436974bed67ad9683a26124cd69e53 SHA512 fbc08f6a7d701df179a0b59e6b9d242faefc1801b2cda5f15d821ca5de019ac2ab37464f6cd186cd7be39a0fa5545cf89f074a094f437807e16024459a144d82
+DIST libkcddb-24.01.95.tar.xz 451888 BLAKE2B a4c41f3d695b64f5d9a8b056e3e059db71ea885179ffd206435d2b04337935b5acf89d5b2d0bad210d8cc764b4fd92c6f795b5ba12cf0504619e53bd60cfc1e7 SHA512 c3f8adbc024d1995c3c346386e12d4a0841ca62b3f1d1c4f89492fcd9fc2d62c4a9c52fdab2f9412b246af8870b16f66f2756d9d82a4dd1517d6fa4a1063bfbc
 EBUILD libkcddb-23.08.4.ebuild 1129 BLAKE2B 551b563c22971c640408b8416c808a59a49f967dd0c0a0dfff36a64cd34e8015d280af2a888efd672429aa1648852e3b05a2a421e30dfadc3d296e810570de9c SHA512 8bf861760125bab6ae61c1e5182ddba70a72f4dda3efb7688800f7a8b4adb2a09927eee6be5e716a8a2f1f82c29f6dce091321dcd13f0879cda130ab1fe36dfb
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+EBUILD libkcddb-23.08.5.ebuild 1458 BLAKE2B 071a184ea8b4b69b6641829edd05677e633808fc8a06711c79d5f48ac71731fd9cc1e3bee04628ed7983ad393ec028663029cff386901d8e36619ead2c90f168 SHA512 18d2ff53427fbd48eb16e36845dfec87db3deb58a3de795892547095db55f4ae89f8fa38ee49cb14e541280cb910562e00181fb3763432b33e3b026a8c2fa155
+EBUILD libkcddb-24.01.95.ebuild 1103 BLAKE2B ae21c1bec0e663b43d133a0fc4e89fbdcc902e9df85532ff8fc92dbf4d1a17190b626623cd0a0a69d5ed7edd3c15a6c13715e67c674fec713eab4b75db6a7b5f SHA512 3bc964f8841bee22470a8f972774569db34c1ce62e53534aad3bc76089c83fd118f5a886a7a0f21a80144f4a2c154446aa81aeaa3ce0fcefd2ae00240156274f
+MISC metadata.xml 437 BLAKE2B 2003b1d95cf9e5003a00dee70b38f274c19409d922c0f9db381c0b64631541183d642951af2c2e088fdd4ca019728e4692346397a664cfbfea5adf76bd154901 SHA512 742e962cd1f78a6eee879e58da6d665211f55c30f84c1cd6f0b87921646965c1e6348b9c8ec161cbc7ef2983f0f950b9f05b28836671fa5c298262eaf4db473e
diff --git a/kde-apps/libkcddb/libkcddb-23.08.5.ebuild b/kde-apps/libkcddb/libkcddb-23.08.5.ebuild
new file mode 100644
index 000000000000..3f036b12d509
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-23.08.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE library for CDDB"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="musicbrainz kf6compat"
+
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	musicbrainz? ( media-libs/musicbrainz:5 )
+"
+RDEPEND="${DEPEND}
+	kf6compat? ( kde-apps/libkcddb:6 )
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
+
+src_prepare() {
+	ecm_src_prepare
+	use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package musicbrainz MusicBrainz5)
+	)
+
+	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/libkcddb-24.01.95.ebuild b/kde-apps/libkcddb/libkcddb-24.01.95.ebuild
new file mode 100644
index 000000000000..a02ec11a3a1f
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-24.01.95.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.249.0
+QTMIN=6.6.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE library for CDDB"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="musicbrainz"
+
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	musicbrainz? ( media-libs/musicbrainz:5 )
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+src_prepare() {
+	ecm_src_prepare
+	use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package musicbrainz MusicBrainz5)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/libkcddb/metadata.xml b/kde-apps/libkcddb/metadata.xml
index d925f2439758..c45be7e6598a 100644
--- a/kde-apps/libkcddb/metadata.xml
+++ b/kde-apps/libkcddb/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
+	<use>
+		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
+	</use>
 </pkgmetadata>