commit: 2d584831f3f62da82c55d608e9d157b914c06ff8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 18:55:13 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 20:53:49 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d584831
kde-apps/libkcddb: RDEPEND on kde-apps/libkcddb-common
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/libkcddb/libkcddb-24.07.90.ebuild | 16 +++++++++++-----
kde-apps/libkcddb/libkcddb-24.08.0.ebuild | 16 +++++++++++-----
kde-apps/libkcddb/libkcddb-24.08.49.9999.ebuild | 16 +++++++++++-----
kde-apps/libkcddb/libkcddb-9999.ebuild | 16 +++++++++++-----
4 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/kde-apps/libkcddb/libkcddb-24.07.90.ebuild
b/kde-apps/libkcddb/libkcddb-24.07.90.ebuild
index 5eef44b45b..c3e83eb4fc 100644
--- a/kde-apps/libkcddb/libkcddb-24.07.90.ebuild
+++ b/kde-apps/libkcddb/libkcddb-24.07.90.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
ECM_TEST="true"
KFMIN=6.5.0
QTMIN=6.7.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
}
diff --git a/kde-apps/libkcddb/libkcddb-24.08.0.ebuild
b/kde-apps/libkcddb/libkcddb-24.08.0.ebuild
index 5eef44b45b..c3e83eb4fc 100644
--- a/kde-apps/libkcddb/libkcddb-24.08.0.ebuild
+++ b/kde-apps/libkcddb/libkcddb-24.08.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
ECM_TEST="true"
KFMIN=6.5.0
QTMIN=6.7.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
}
diff --git a/kde-apps/libkcddb/libkcddb-24.08.49.9999.ebuild
b/kde-apps/libkcddb/libkcddb-24.08.49.9999.ebuild
index 0137e68495..b682fe47f8 100644
--- a/kde-apps/libkcddb/libkcddb-24.08.49.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-24.08.49.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
ECM_TEST="true"
KFMIN=6.5.0
QTMIN=6.7.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=""
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
}
diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild
b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 0137e68495..b682fe47f8 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoff"
ECM_TEST="true"
KFMIN=6.5.0
QTMIN=6.7.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=""
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
}
