gentoo auto-resync : 22:08:2024 - 12:26:19

3 files changed, 70 insertions, 6 deletions

diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 771c96de76ab..3da92945b9ed 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,6 @@
 DIST libkcddb-23.08.5.tar.xz 451388 BLAKE2B 2c6118d0f9f263d45226005340d66c99b32171459ad2f744b788b3d88f714546b99421251422fae6296b97fbcb3523ee12436974bed67ad9683a26124cd69e53 SHA512 fbc08f6a7d701df179a0b59e6b9d242faefc1801b2cda5f15d821ca5de019ac2ab37464f6cd186cd7be39a0fa5545cf89f074a094f437807e16024459a144d82
 DIST libkcddb-24.05.2.tar.xz 449172 BLAKE2B afd8371d9c05ebfffc173bdfa1ccf64dacc0caec1cae4c20c7ea9aca74795cc0567fc022589ecd8c54740a22e0d632a0ab3e5209258dde0bcb5e6aa10407281e SHA512 f6797a56c0362b0979b329a27a913bf36334587e86b1c50ab5dd5373b1cff0b69577e9ebff22bea93683c9c3c9da68339dc5e57d2926e6865f5b19ef5cfb51cf
+EBUILD libkcddb-23.08.5-r1.ebuild 1325 BLAKE2B b6992fa070c1cdf05b0c205699355d934cde9af463acd4af13661a6496a02185000fe932fef02a483ccfd5a52c86b4d23431d40ae2b363dbdc44eecbd51808dc SHA512 f6c2f907f204784ceb4d119e6242e8bb103e38441fe956d2dd47ab31a0986b23fcef710f6be2855e59a11409a8c1de32bf202bfcbf3e8389338e972410bc5928
 EBUILD libkcddb-23.08.5.ebuild 1455 BLAKE2B 869401ab939c0ae3232e37944b4ab1ce984bf294a7ec10b3073d9b0a85b951ad6d6d22910b56042e67d2cd22cd129136dda691e13b6f63905599b9ee9c4ca1ad SHA512 45b90a1ce525b481f56c1176e02c3705d2015da80a63ede0bd1ab1539914a01907033c20c67506b57927464cf6d77e649c2e4212906c86e5ff6443ce736f85c4
-EBUILD libkcddb-24.05.2.ebuild 1127 BLAKE2B 347a498882645437b67b172c4411cd4e84dcaa1d4865a2245158c1dfb599b7b21f920bd1910ca2396590956522630a3d80df7f3f3590811263d560072a80590d SHA512 d90736af053938a5ccd72968c46e15430c510eb61a48cd11e1104f546ebb970c027923e6a7708a92c8f36949586f406a39f78946c9fd91ae0b2710095ff3434a
+EBUILD libkcddb-24.05.2-r1.ebuild 1282 BLAKE2B 4931f2ccb954a4bd1a1eaf3ca74878496d5e39c84574542835d714c7a11d4abf21c38237062c6343d8395a9805145e4b7be1715f3bc44be36f685141cfc1a0fc SHA512 2007b228e4cf18212b20ccfe7d6d496de7904a0b93b82cbb6c624beefd832f42fb8c12961db07f90327c0fbd51f2108cc0c25334ef157f546c06029194b6cd69
 MISC metadata.xml 530 BLAKE2B e7b2030572e79d1a5e8270f6994256939741e6d807b3b86feb6507f15a5bed4d742eb50469e2e37d238f5339427298ac89d17c507a2779bfeab521ee30f2f958 SHA512 b4ea42cdcf007b1a051eced437cfb95066b3abdc08e71702756291434d2b88a9f2fdc15e87e3ad103fb12db9597fd8ef181b2f01977eb2f4486b39573c89d3ca
diff --git a/kde-apps/libkcddb/libkcddb-23.08.5-r1.ebuild b/kde-apps/libkcddb/libkcddb-23.08.5-r1.ebuild
new file mode 100644
index 000000000000..d1d02a33c320
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-23.08.5-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoff"
+ECM_TEST="true"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="KDE library for CDDB"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="musicbrainz"
+
+# 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}
+	>=kde-apps/libkcddb-common-${PV}
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
+
+# Shipped by kde-apps/libkcddb-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/applications/kcm_cddb.desktop
+	/usr/share/config.kcfg/libkcddb5.kcfg
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+	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/libkcddb-24.05.2.ebuild b/kde-apps/libkcddb/libkcddb-24.05.2-r1.ebuild
index d6756e1ffd4e..eb7a69c834c0 100644
--- a/kde-apps/libkcddb/libkcddb-24.05.2.ebuild
+++ b/kde-apps/libkcddb/libkcddb-24.05.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
 ECM_TEST="true"
 KFMIN=6.3.0
 QTMIN=6.6.2
@@ -11,7 +11,7 @@ inherit ecm gear.kde.org
 
 DESCRIPTION="KDE library for CDDB"
 
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="musicbrainz"
@@ -31,19 +31,25 @@ DEPEND="
 	musicbrainz? ( media-libs/musicbrainz:5 )
 "
 RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+	>=kde-apps/libkcddb-common-${PV}
 "
 BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
 
+# Shipped by kde-apps/libkcddb-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/applications/kcm_cddb.desktop
+	/usr/share/config.kcfg/libkcddb5.kcfg
+)
+
 src_prepare() {
 	ecm_src_prepare
-	use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
+	ecm_punt_po_install
+	cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
 }
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package musicbrainz MusicBrainz5)
 	)
-
 	ecm_src_configure
 }