public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2014-11-24 17:44 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2014-11-24 17:44 UTC (permalink / raw
  To: gentoo-commits

commit:     babd414bce884006cf9cae917085ca2328979a11
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 24 17:44:48 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Nov 24 17:44:48 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=babd414b

[kde-apps/libkcddb] Introduce handbook USE flag wrt bug #486670.

Package-Manager: portage-2.2.14

---
 kde-apps/libkcddb/libkcddb-14.11.95.ebuild | 11 +++++++++++
 kde-apps/libkcddb/libkcddb-9999.ebuild     | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/kde-apps/libkcddb/libkcddb-14.11.95.ebuild b/kde-apps/libkcddb/libkcddb-14.11.95.ebuild
index 5a81777..1f1ee6e 100644
--- a/kde-apps/libkcddb/libkcddb-14.11.95.ebuild
+++ b/kde-apps/libkcddb/libkcddb-14.11.95.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE library for CDDB"
@@ -21,6 +22,16 @@ RDEPEND="${DEPEND}"
 
 KMSAVELIBS="true"
 
+src_prepare() {
+	kde4-base_src_prepare
+
+	if ! use handbook ; then
+		pushd kcmcddb > /dev/null
+		comment_add_subdirectory doc
+		popd > /dev/null
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with musicbrainz MusicBrainz5)

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 5a81777..1f1ee6e 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE library for CDDB"
@@ -21,6 +22,16 @@ RDEPEND="${DEPEND}"
 
 KMSAVELIBS="true"
 
+src_prepare() {
+	kde4-base_src_prepare
+
+	if ! use handbook ; then
+		pushd kcmcddb > /dev/null
+		comment_add_subdirectory doc
+		popd > /dev/null
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with musicbrainz MusicBrainz5)


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2015-10-12 12:46 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2015-10-12 12:46 UTC (permalink / raw
  To: gentoo-commits

commit:     235596e86221ddaff60bbc0a6ae5358cdcc0b419
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 12:41:49 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 12:41:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=235596e8

kde-apps/libkcddb: nitpicks

Package-Manager: portage-2.2.20.1

 kde-apps/libkcddb/libkcddb-15.08.49.9999.ebuild | 4 ++--
 kde-apps/libkcddb/libkcddb-9999.ebuild          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-15.08.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-15.08.49.9999.ebuild
index 9e6dca6..3aceb53 100644
--- a/kde-apps/libkcddb/libkcddb-15.08.49.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-15.08.49.9999.ebuild
@@ -26,9 +26,9 @@ src_prepare() {
 	kde4-base_src_prepare
 
 	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
+		pushd kcmcddb > /dev/null || die
 		comment_add_subdirectory doc
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 }
 

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 9e6dca6..3aceb53 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -26,9 +26,9 @@ src_prepare() {
 	kde4-base_src_prepare
 
 	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
+		pushd kcmcddb > /dev/null || die
 		comment_add_subdirectory doc
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2016-03-31 18:16 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2016-03-31 18:16 UTC (permalink / raw
  To: gentoo-commits

commit:     9e340d2f6c7ae1113fadc931f32ff30a8dd36f2b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 18:12:12 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 18:12:12 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9e340d2f

kde-apps/libkcddb: EAPI 6

Package-Manager: portage-2.2.28

 kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild | 4 ++--
 kde-apps/libkcddb/libkcddb-5.9999.ebuild        | 2 +-
 kde-apps/libkcddb/libkcddb-9999.ebuild          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild
index 4c5df1d..a5e50cb 100644
--- a/kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
@@ -34,7 +34,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with musicbrainz MusicBrainz5)
+		-DWITH_MusicBrainz5=$(usex musicbrainz)
 	)
 
 	kde4-base_src_configure

diff --git a/kde-apps/libkcddb/libkcddb-5.9999.ebuild b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
index 1600636..da23710 100644
--- a/kde-apps/libkcddb/libkcddb-5.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_BRANCH="kf5"
 KDE_TEST="true"

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 4c5df1d..a5e50cb 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 inherit kde4-base
@@ -34,7 +34,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with musicbrainz MusicBrainz5)
+		-DWITH_MusicBrainz5=$(usex musicbrainz)
 	)
 
 	kde4-base_src_configure


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2016-04-09 11:42 Christian Schmitt
  0 siblings, 0 replies; 20+ messages in thread
From: Christian Schmitt @ 2016-04-09 11:42 UTC (permalink / raw
  To: gentoo-commits

commit:     9441b306a6eef665f18bf60895feaac5af987020
Author:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Sat Apr  9 11:41:48 2016 +0000
Commit:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Sat Apr  9 11:41:48 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9441b306

libkcddb-16.03.90.ebuild: EAPI 6 syntax fix

 kde-apps/libkcddb/libkcddb-16.03.90.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/libkcddb/libkcddb-16.03.90.ebuild b/kde-apps/libkcddb/libkcddb-16.03.90.ebuild
index 8bf9bf1..6e7cbb8 100644
--- a/kde-apps/libkcddb/libkcddb-16.03.90.ebuild
+++ b/kde-apps/libkcddb/libkcddb-16.03.90.ebuild
@@ -27,7 +27,7 @@ src_prepare() {
 
 	if ! use handbook ; then
 		pushd kcmcddb > /dev/null || die
-		comment_add_subdirectory doc
+		cmake_comment_add_subdirectory doc
 		popd > /dev/null || die
 	fi
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2016-04-10  9:20 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2016-04-10  9:20 UTC (permalink / raw
  To: gentoo-commits

commit:     4f3b10c692d8f9edf5ad4f54b93263b1e4142550
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 09:19:30 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 09:19:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4f3b10c6

kde-apps/libkcddb: Fix src_prepare

Package-Manager: portage-2.2.28

 kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild | 2 +-
 kde-apps/libkcddb/libkcddb-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild
index a5e50cb..fb9baf3 100644
--- a/kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-16.04.49.9999.ebuild
@@ -27,7 +27,7 @@ src_prepare() {
 
 	if ! use handbook ; then
 		pushd kcmcddb > /dev/null || die
-		comment_add_subdirectory doc
+		cmake_comment_add_subdirectory doc
 		popd > /dev/null || die
 	fi
 }

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index a5e50cb..fb9baf3 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -27,7 +27,7 @@ src_prepare() {
 
 	if ! use handbook ; then
 		pushd kcmcddb > /dev/null || die
-		comment_add_subdirectory doc
+		cmake_comment_add_subdirectory doc
 		popd > /dev/null || die
 	fi
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2016-07-15 11:19 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2016-07-15 11:19 UTC (permalink / raw
  To: gentoo-commits

commit:     a9f7bb31fb67c3fadb6b6c1b008c7c130ecc63a8
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 11:17:19 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 11:17:19 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a9f7bb31

kde-apps/libkcddb: Frameworks merged to master

Package-Manager: portage-2.3.0

 kde-apps/libkcddb/libkcddb-5.9999.ebuild | 40 --------------------------------
 kde-apps/libkcddb/libkcddb-9999.ebuild   | 32 ++++++++++++-------------
 2 files changed, 15 insertions(+), 57 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-5.9999.ebuild b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
deleted file mode 100644
index da23710..0000000
--- a/kde-apps/libkcddb/libkcddb-5.9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="kf5"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library for CDDB"
-KEYWORDS=""
-IUSE="musicbrainz"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT=test
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index fb9baf3..4d983d4 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -4,38 +4,36 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_TEST="true"
+inherit kde5
 
 DESCRIPTION="KDE library for CDDB"
 KEYWORDS=""
-IUSE="debug musicbrainz"
+IUSE="musicbrainz"
 
 # tests require network access and compare static data with online data
 # bug 280996
 RESTRICT=test
 
 DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
 	musicbrainz? ( media-libs/musicbrainz:5 )
 "
 RDEPEND="${DEPEND}"
 
-KMSAVELIBS="true"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null || die
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null || die
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_MusicBrainz5=$(usex musicbrainz)
+		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
 	)
 
-	kde4-base_src_configure
+	kde5_src_configure
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2016-07-16  9:19 Johannes Huber
  0 siblings, 0 replies; 20+ messages in thread
From: Johannes Huber @ 2016-07-16  9:19 UTC (permalink / raw
  To: gentoo-commits

commit:     5e76266b5737a4b7b70163152ed862a99c8ed561
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 09:17:41 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 09:17:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e76266b

kde-apps/libkcddb: Frameworks merge was reverted

Upstream reverted the merge so we need to follow.

This reverts commit a9f7bb31fb67c3fadb6b6c1b008c7c130ecc63a8.

 ...libkcddb-9999.ebuild => libkcddb-5.9999.ebuild} |  1 +
 kde-apps/libkcddb/libkcddb-9999.ebuild             | 32 ++++++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
similarity index 97%
copy from kde-apps/libkcddb/libkcddb-9999.ebuild
copy to kde-apps/libkcddb/libkcddb-5.9999.ebuild
index 4d983d4..da23710 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=6
 
+EGIT_BRANCH="kf5"
 KDE_TEST="true"
 inherit kde5
 

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 4d983d4..fb9baf3 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -4,36 +4,38 @@
 
 EAPI=6
 
-KDE_TEST="true"
-inherit kde5
+KDE_HANDBOOK="optional"
+inherit kde4-base
 
 DESCRIPTION="KDE library for CDDB"
 KEYWORDS=""
-IUSE="musicbrainz"
+IUSE="debug musicbrainz"
 
 # tests require network access and compare static data with online data
 # bug 280996
 RESTRICT=test
 
 DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
 	musicbrainz? ( media-libs/musicbrainz:5 )
 "
 RDEPEND="${DEPEND}"
 
+KMSAVELIBS="true"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	if ! use handbook ; then
+		pushd kcmcddb > /dev/null || die
+		cmake_comment_add_subdirectory doc
+		popd > /dev/null || die
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
+		-DWITH_MusicBrainz5=$(usex musicbrainz)
 	)
 
-	kde5_src_configure
+	kde4-base_src_configure
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2016-08-18 12:48 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2016-08-18 12:48 UTC (permalink / raw
  To: gentoo-commits

commit:     ec45e3d3f2b4be99c0eb4e19eb284f91402b6003
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 10:00:31 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 12:48:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec45e3d3

kde-apps/libkcddb: Frameworks merged to master

Package-Manager: portage-2.2.28

 kde-apps/libkcddb/libkcddb-5.9999.ebuild | 40 --------------------------------
 kde-apps/libkcddb/libkcddb-9999.ebuild   | 32 ++++++++++++-------------
 2 files changed, 15 insertions(+), 57 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-5.9999.ebuild b/kde-apps/libkcddb/libkcddb-5.9999.ebuild
deleted file mode 100644
index da23710..0000000
--- a/kde-apps/libkcddb/libkcddb-5.9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="kf5"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library for CDDB"
-KEYWORDS=""
-IUSE="musicbrainz"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT=test
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index fb9baf3..4d983d4 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -4,38 +4,36 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_TEST="true"
+inherit kde5
 
 DESCRIPTION="KDE library for CDDB"
 KEYWORDS=""
-IUSE="debug musicbrainz"
+IUSE="musicbrainz"
 
 # tests require network access and compare static data with online data
 # bug 280996
 RESTRICT=test
 
 DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
 	musicbrainz? ( media-libs/musicbrainz:5 )
 "
 RDEPEND="${DEPEND}"
 
-KMSAVELIBS="true"
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null || die
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null || die
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_MusicBrainz5=$(usex musicbrainz)
+		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
 	)
 
-	kde4-base_src_configure
+	kde5_src_configure
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2016-08-25 20:03 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2016-08-25 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     25cfcd39b8f0127d4e2f7021efdf011e12288f3b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 19:55:43 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 20:03:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=25cfcd39

kde-apps/libkcddb: add LICENSE

Package-Manager: portage-2.3.0

 kde-apps/libkcddb/libkcddb-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index badacce..4509571 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -9,6 +9,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="KDE library for CDDB"
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS=""
 IUSE="musicbrainz"
 


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2016-08-25 20:03 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2016-08-25 20:03 UTC (permalink / raw
  To: gentoo-commits

commit:     327848312decca6f04a8eb06b7647d4292f58f51
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 19:54:28 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 20:03:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=32784831

kde-apps/libkcddb: enable handbook

Package-Manager: portage-2.3.0

 kde-apps/libkcddb/libkcddb-9999.ebuild | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 4d983d4..badacce 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=6
 
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 inherit kde5
 
@@ -30,6 +31,16 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use handbook ; then
+		pushd kcmcddb > /dev/null
+		cmake_comment_add_subdirectory doc
+		popd > /dev/null
+	fi
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2016-08-31 14:35 Michael Palimaka
  0 siblings, 0 replies; 20+ messages in thread
From: Michael Palimaka @ 2016-08-31 14:35 UTC (permalink / raw
  To: gentoo-commits

commit:     6c4e34b1b993f0bd2bddf37254ee808c468d1244
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 27 20:33:43 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 14:35:18 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6c4e34b1

kde-apps/libkcddb: Do not block SLOT 4

Package-Manager: portage-2.2.28

 kde-apps/libkcddb/libkcddb-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 4509571..605b703 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=6
 
+KDE_BLOCK_SLOT4="false"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 inherit kde5


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2020-12-29 16:03 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2020-12-29 16:03 UTC (permalink / raw
  To: gentoo-commits

commit:     b58e86d7a900f0bec9fc4e994928782074d94b18
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 10:39:37 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 10:39:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b58e86d7

kde-apps/libkcddb: Use cmake_run_in

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild | 7 +------
 kde-apps/libkcddb/libkcddb-9999.ebuild          | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild
index 43eb73f470..3a9e6cfdbf 100644
--- a/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-20.12.49.9999.ebuild
@@ -38,12 +38,7 @@ PATCHES=( "${FILESDIR}/${PN}-20.12.1-unused-dep.patch" )
 
 src_prepare() {
 	ecm_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null
-	fi
+	use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
 }
 
 src_configure() {

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 59e885bf55..ba517c4901 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -36,12 +36,7 @@ RESTRICT+=" test"
 
 src_prepare() {
 	ecm_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null
-	fi
+	use handbook || cmake_run_in kcmcddb cmake_comment_add_subdirectory doc
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2023-03-25  0:15 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2023-03-25  0:15 UTC (permalink / raw
  To: gentoo-commits

commit:     e43b8701399a3ae48fb4d2face07ff6235b9521c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 24 23:48:30 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 24 23:48:30 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e43b8701

kde-apps/libkcddb: Add new dependency

Upstream commit acab7a949c14fb444026c2955d5ef940c788a988

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/libkcddb/libkcddb-9999.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 08fc40ade3..fd3b3cc8b0 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -16,6 +16,10 @@ SLOT="5"
 KEYWORDS=""
 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
@@ -29,10 +33,7 @@ DEPEND="
 	musicbrainz? ( media-libs/musicbrainz:5 )
 "
 RDEPEND="${DEPEND}"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT="test"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
 
 src_prepare() {
 	ecm_src_prepare


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2023-12-09 10:03 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2023-12-09 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     d71eb87ada05dcc8ffb464d91a3f35c03daa4fe6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 09:50:11 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 10:03:06 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d71eb87a

kde-apps/libkcddb: Add IUSE kf6compat

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/libkcddb/libkcddb-23.08.49.9999.ebuild | 19 +++++++++++++++++--
 kde-apps/libkcddb/metadata.xml                  |  4 ++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-23.08.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-23.08.49.9999.ebuild
index 7e422a3f0f..b11d400df2 100644
--- a/kde-apps/libkcddb/libkcddb-23.08.49.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-23.08.49.9999.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE library for CDDB"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
 KEYWORDS=""
-IUSE="musicbrainz"
+IUSE="musicbrainz kf6compat"
 
 # tests require network access and compare static data with online data
 # bug 280996
@@ -32,7 +32,9 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	musicbrainz? ( media-libs/musicbrainz:5 )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	kf6compat? ( kde-apps/libkcddb:6 )
+"
 BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
 
 src_prepare() {
@@ -47,3 +49,16 @@ src_configure() {
 
 	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/metadata.xml b/kde-apps/libkcddb/metadata.xml
index d925f24397..3180280914 100644
--- a/kde-apps/libkcddb/metadata.xml
+++ b/kde-apps/libkcddb/metadata.xml
@@ -7,5 +7,9 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">multimedia/libkcddb</remote-id>
 	</upstream>
+	<use>
+		<flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2023-12-09 10:03 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2023-12-09 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     a7f27acc95a9c284d318fcca44e372de134b8385
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  6 21:35:15 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 10:03:06 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7f27acc

kde-apps/libkcddb: Port to KF6

Blocking kde-apps/libkcddb:5[-kf6compat(-)]

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/libkcddb/libkcddb-9999.ebuild | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 7e422a3f0f..ca11ab6a52 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -5,14 +5,14 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org
 
 DESCRIPTION="KDE library for CDDB"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="musicbrainz"
 
@@ -21,19 +21,19 @@ IUSE="musicbrainz"
 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
+	>=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}"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
 
 src_prepare() {
 	ecm_src_prepare


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2023-12-09 11:59 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2023-12-09 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     1a77ff54d3d28b6e8cbe2fea61fdd4e6eba46286
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 11:21:17 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 11:21:17 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a77ff54

kde-apps/libkcddb: Set KDE_BLOCK_SLOT5="false"

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/libkcddb/libkcddb-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index ca11ab6a52..c8181decfd 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
+KDE_BLOCK_SLOT5="false"
 KFMIN=5.245.0
 QTMIN=6.6.0
 inherit ecm gear.kde.org


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2024-02-25 20:02 Sam James
  0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2024-02-25 20:02 UTC (permalink / raw
  To: gentoo-commits

commit:     b9fa3a34d62c77978682fc8fd322a6fda1a20b3d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 19:52:09 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 19:53:06 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b9fa3a34

kde-apps/libkcddb: refresh deps

* Add qt5compat for upstream commit 13cfd08fed32f14979d7b9b12d633b7c5e4634a7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 kde-apps/libkcddb/libkcddb-24.02.0.ebuild       | 1 +
 kde-apps/libkcddb/libkcddb-24.02.49.9999.ebuild | 1 +
 kde-apps/libkcddb/libkcddb-9999.ebuild          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-apps/libkcddb/libkcddb-24.02.0.ebuild b/kde-apps/libkcddb/libkcddb-24.02.0.ebuild
index 8771bf24e1..ca1961184a 100644
--- a/kde-apps/libkcddb/libkcddb-24.02.0.ebuild
+++ b/kde-apps/libkcddb/libkcddb-24.02.0.ebuild
@@ -22,6 +22,7 @@ RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qt5compat-${QTMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6

diff --git a/kde-apps/libkcddb/libkcddb-24.02.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-24.02.49.9999.ebuild
index f52176455c..00ace17d9b 100644
--- a/kde-apps/libkcddb/libkcddb-24.02.49.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-24.02.49.9999.ebuild
@@ -22,6 +22,7 @@ RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qt5compat-${QTMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index f52176455c..00ace17d9b 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -22,6 +22,7 @@ RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
+	>=dev-qt/qt5compat-${QTMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2024-05-17 15:29 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2024-05-17 15:29 UTC (permalink / raw
  To: gentoo-commits

commit:     85619948152e84668492b5bcb2c5733086517471
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 15:17:24 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 17 15:17:24 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=85619948

kde-apps/libkcddb: Drop unused dependency

Upstream commit b96b1cfbcff6011d9be91dbea4b2322b2dd0bc58

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/libkcddb/libkcddb-24.04.90.ebuild      | 1 -
 kde-apps/libkcddb/libkcddb-24.05.49.9999.ebuild | 1 -
 kde-apps/libkcddb/libkcddb-9999.ebuild          | 1 -
 3 files changed, 3 deletions(-)

diff --git a/kde-apps/libkcddb/libkcddb-24.04.90.ebuild b/kde-apps/libkcddb/libkcddb-24.04.90.ebuild
index e43c556639..124fbaa0ce 100644
--- a/kde-apps/libkcddb/libkcddb-24.04.90.ebuild
+++ b/kde-apps/libkcddb/libkcddb-24.04.90.ebuild
@@ -22,7 +22,6 @@ RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=dev-qt/qt5compat-${QTMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6

diff --git a/kde-apps/libkcddb/libkcddb-24.05.49.9999.ebuild b/kde-apps/libkcddb/libkcddb-24.05.49.9999.ebuild
index 8786f20ff4..a6dc584cab 100644
--- a/kde-apps/libkcddb/libkcddb-24.05.49.9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-24.05.49.9999.ebuild
@@ -22,7 +22,6 @@ RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=dev-qt/qt5compat-${QTMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6

diff --git a/kde-apps/libkcddb/libkcddb-9999.ebuild b/kde-apps/libkcddb/libkcddb-9999.ebuild
index 8786f20ff4..a6dc584cab 100644
--- a/kde-apps/libkcddb/libkcddb-9999.ebuild
+++ b/kde-apps/libkcddb/libkcddb-9999.ebuild
@@ -22,7 +22,6 @@ RESTRICT="test"
 
 DEPEND="
 	>=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets]
-	>=dev-qt/qt5compat-${QTMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2024-08-12 18:57 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2024-08-12 18:57 UTC (permalink / raw
  To: gentoo-commits

commit:     58d23880b2b67c12acf34fd1128d4d15c5a7b33f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 18:56:32 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 18:56:32 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=58d23880

kde-apps/libkcddb: Amend upstream metadata

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/libkcddb/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/libkcddb/metadata.xml b/kde-apps/libkcddb/metadata.xml
index 5e8fb4abfb..b3bfb0b912 100644
--- a/kde-apps/libkcddb/metadata.xml
+++ b/kde-apps/libkcddb/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=libkcddb</bugs-to>
 		<remote-id type="kde-invent">multimedia/libkcddb</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/
@ 2024-08-21 21:47 Andreas Sturmlechner
  0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2024-08-21 21:47 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2024-08-21 21:47 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-31 18:16 [gentoo-commits] proj/kde:master commit in: kde-apps/libkcddb/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2024-08-21 21:47 Andreas Sturmlechner
2024-08-12 18:57 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
2015-10-12 12:46 Michael Palimaka
2014-11-24 17:44 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox