[gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
Date: Wed, 21 Aug 2024 21:47:30 +0000 (UTC)	[thread overview]
Message-ID: <1724273629.2d584831f3f62da82c55d608e9d157b914c06ff8.asturm@gentoo> (raw)

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
 }

next             reply	other threads:[~2024-08-21 21:47 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-21 21:47 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-12 18:57 [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/ 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-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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:5eef44b45 dfblob:c3e83eb4f dfblob:5eef44b45 dfblob:c3e83eb4f
dfblob:0137e6849 dfblob:b682fe47f dfblob:0137e6849 dfblob:b682fe47f )
 OR (
bs:"[gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/" )
	(help)

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=1724273629.2d584831f3f62da82c55d608e9d157b914c06ff8.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