* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2015-09-10 18:15 Michael Palimaka
0 siblings, 0 replies; 13+ messages in thread
From: Michael Palimaka @ 2015-09-10 18:15 UTC (permalink / raw
To: gentoo-commits
commit: 2da03cac6abe542cdbcb9c27f03a8d6b467fed2a
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Sep 4 18:18:55 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 18:15:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2da03cac
kde-apps/libkcompactdisc: Add kf5 version
Upstream took care not to collide with kde4-based libkcompactdisc
Merge pull request #368 from a17r/amarok
Package-Manager: portage-2.2.20.1
.../libkcompactdisc/libkcompactdisc-5.9999.ebuild | 28 ++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
new file mode 100644
index 0000000..2ac175b
--- /dev/null
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_BRANCH="frameworks"
+inherit kde5
+
+DESCRIPTION="Library for playing & ripping CDs"
+KEYWORDS=""
+IUSE="alsa"
+
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep solid)
+ media-libs/phonon[qt5]
+ dev-qt/qtdbus:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package alsa)
+ )
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2015-10-01 11:25 Michael Palimaka
0 siblings, 0 replies; 13+ messages in thread
From: Michael Palimaka @ 2015-10-01 11:25 UTC (permalink / raw
To: gentoo-commits
commit: f5f8e04a9486fb8cafb351159ffd8c7514f1455f
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Oct 1 10:02:39 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 1 11:25:19 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f5f8e04a
kde-apps/libkcompactdisc: Add missing DEPEND
Package-Manager: portage-2.2.20.1
kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
index 2ac175b..ee80fa9 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
@@ -13,6 +13,7 @@ IUSE="alsa"
DEPEND="
$(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep solid)
media-libs/phonon[qt5]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2016-03-31 18:16 Johannes Huber
0 siblings, 0 replies; 13+ messages in thread
From: Johannes Huber @ 2016-03-31 18:16 UTC (permalink / raw
To: gentoo-commits
commit: c292941b9fdac830c334d2f45243fdf5f13c91be
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 18:09:53 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 18:09:53 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c292941b
kde-apps/libkcompactdisc: EAPI 6
Package-Manager: portage-2.2.28
kde-apps/libkcompactdisc/libkcompactdisc-16.04.49.9999.ebuild | 2 +-
kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild | 2 +-
kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-16.04.49.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-16.04.49.9999.ebuild
index a56d284..a1b37f3 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-16.04.49.9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-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
inherit kde4-base
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
index 638ec05..22b025b 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-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="frameworks"
inherit kde5
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index a56d284..a1b37f3 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit kde4-base
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2016-04-24 16:57 Michael Palimaka
0 siblings, 0 replies; 13+ messages in thread
From: Michael Palimaka @ 2016-04-24 16:57 UTC (permalink / raw
To: gentoo-commits
commit: f87559adbf2d2703d92160ec74e63acf9097155f
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Apr 24 12:59:12 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 16:56:22 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f87559ad
kde-apps/libkcompactdisc: Fix configure with EAPI=6
Package-Manager: portage-2.2.27
kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
index 22b025b..fc089d8 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
@@ -16,14 +16,14 @@ DEPEND="
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep solid)
- media-libs/phonon[qt5]
$(add_qt_dep qtdbus)
+ media-libs/phonon[qt5]
"
RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package alsa)
+ $(cmake-utils_use_find_package alsa Alsa)
)
kde5_src_configure
}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2016-08-18 12:48 Michael Palimaka
0 siblings, 0 replies; 13+ messages in thread
From: Michael Palimaka @ 2016-08-18 12:48 UTC (permalink / raw
To: gentoo-commits
commit: d0513bfd2b9b84d9ad1848f94493c3499cd06051
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 06:25:52 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=d0513bfd
kde-apps/libkcompactdisc: Frameworks merged to master
Package-Manager: portage-2.2.28
.../libkcompactdisc/libkcompactdisc-5.9999.ebuild | 29 ----------------------
.../libkcompactdisc/libkcompactdisc-9999.ebuild | 16 +++++++-----
2 files changed, 10 insertions(+), 35 deletions(-)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
deleted file mode 100644
index fc089d8..0000000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-5.9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Library for playing & ripping CDs"
-KEYWORDS=""
-IUSE="alsa"
-
-DEPEND="
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep solid)
- $(add_qt_dep qtdbus)
- media-libs/phonon[qt5]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package alsa Alsa)
- )
- kde5_src_configure
-}
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index a1b37f3..90dd6ac 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -4,15 +4,19 @@
EAPI=6
-inherit kde4-base
+inherit kde5
-DESCRIPTION="KDE library for playing & ripping CDs"
+DESCRIPTION="Library for playing & ripping CDs"
KEYWORDS=""
-IUSE="alsa debug"
+IUSE="alsa"
DEPEND="
- media-libs/phonon[qt4]
- alsa? ( media-libs/alsa-lib )
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep solid)
+ $(add_qt_dep qtdbus)
+ media-libs/phonon[qt5]
"
RDEPEND="${DEPEND}"
@@ -20,5 +24,5 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package alsa Alsa)
)
- kde4-base_src_configure
+ kde5_src_configure
}
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2016-08-25 20:03 Michael Palimaka
0 siblings, 0 replies; 13+ messages in thread
From: Michael Palimaka @ 2016-08-25 20:03 UTC (permalink / raw
To: gentoo-commits
commit: 2c17235429cd637042843eb6fd4b41941acae2d1
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 20:00:05 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=2c172354
kde-apps/libkcompactdisc: add LICENSE
Package-Manager: portage-2.3.0
kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index 90dd6ac..b46acab 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -7,6 +7,7 @@ EAPI=6
inherit kde5
DESCRIPTION="Library for playing & ripping CDs"
+LICENSE="GPL-2+ LGPL-2+"
KEYWORDS=""
IUSE="alsa"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2016-08-31 14:35 Michael Palimaka
0 siblings, 0 replies; 13+ messages in thread
From: Michael Palimaka @ 2016-08-31 14:35 UTC (permalink / raw
To: gentoo-commits
commit: f32adae6f16d514dcb1f4b790a9dbb3eb9319521
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 27 20:22:59 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=f32adae6
kde-apps/libkcompactdisc: Do not block SLOT 4
Package-Manager: portage-2.2.28
kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index b46acab..eef3349 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -4,6 +4,7 @@
EAPI=6
+KDE_BLOCK_SLOT4="false"
inherit kde5
DESCRIPTION="Library for playing & ripping CDs"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2017-04-17 13:40 Johannes Huber
0 siblings, 0 replies; 13+ messages in thread
From: Johannes Huber @ 2017-04-17 13:40 UTC (permalink / raw
To: gentoo-commits
commit: ce0b1deed7af6d3bcc304e40c71f802ff712a010
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 13:40:25 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 13:40:25 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ce0b1dee
kde-apps/libkcompactdisc: Revert useless revision bump
Masked and marked as unreleased...
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../{libkcompactdisc-17.04.0-r1.ebuild => libkcompactdisc-17.04.0.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0-r1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild
similarity index 100%
rename from kde-apps/libkcompactdisc/libkcompactdisc-17.04.0-r1.ebuild
rename to kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2021-04-15 20:03 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2021-04-15 20:03 UTC (permalink / raw
To: gentoo-commits
commit: f3004806751a469caf5ffa6ec6731674377b7271
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 15 18:22:44 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 15 20:03:03 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f3004806
kde-apps/libkcompactdisc: Drop unused DEPEND
Upstream commit 1f145a385309477e7a079b3fb22aa95279884cfb
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index 4942ab1d2d..91c2659ad9 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -17,7 +17,6 @@ IUSE="alsa"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
>=media-libs/phonon-4.11.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2023-12-09 10:03 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2023-12-09 10:03 UTC (permalink / raw
To: gentoo-commits
commit: 2a75f54e6686f1e6696bf3e616d226f3dcfa7dd6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 6 21:34:09 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=2a75f54e
kde-apps/libkcompactdisc: Port to KF6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index 09fd9758a9..d392a03f0b 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -4,22 +4,22 @@
EAPI=8
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="Library for playing & ripping CDs"
LICENSE="GPL-2+ LGPL-2+"
-SLOT="5"
+SLOT="6"
KEYWORDS=""
IUSE="alsa"
DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=media-libs/phonon-4.11.0[qt5(+)]
+ >=dev-qt/qtbase-${QTMIN}:6[dbus]
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/solid-${KFMIN}:6
+ >=media-libs/phonon-4.12.0[qt6]
alsa? ( media-libs/alsa-lib )
"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2023-12-09 11:59 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2023-12-09 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 16300c6818a72488f450718e651b97aa4d9a3b89
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 11:21:39 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 11:21:39 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=16300c68
kde-apps/libkcompactdisc: Set KDE_BLOCK_SLOT5="false"
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index d392a03f0b..96e60a1317 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -4,6 +4,7 @@
EAPI=8
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] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2024-01-07 22:01 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2024-01-07 22:01 UTC (permalink / raw
To: gentoo-commits
commit: 7d8197615f0a8c26cc427b90bdca912ad3e8e757
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 21:52:43 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 21:53:57 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d819761
kde-apps/libkcompactdisc: Add IUSE kf6compat
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libkcompactdisc/libkcompactdisc-23.08.49.9999.ebuild | 14 ++++++++++++--
kde-apps/libkcompactdisc/metadata.xml | 4 ++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-23.08.49.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-23.08.49.9999.ebuild
index 0f97da84b5..aef5eba758 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-23.08.49.9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-23.08.49.9999.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for playing & ripping CDs"
LICENSE="GPL-2+ LGPL-2+"
SLOT="5"
KEYWORDS=""
-IUSE="alsa"
+IUSE="alsa kf6compat"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -22,7 +22,9 @@ DEPEND="
>=media-libs/phonon-4.11.0[qt5(+)]
alsa? ( media-libs/alsa-lib )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ kf6compat? ( kde-apps/libkcompactdisc:6 )
+"
src_configure() {
local mycmakeargs=(
@@ -30,3 +32,11 @@ src_configure() {
)
ecm_src_configure
}
+
+src_install() {
+ ecm_src_install
+
+ if use kf6compat; then
+ rm -r "${D}"/usr/share/locale || die
+ fi
+}
diff --git a/kde-apps/libkcompactdisc/metadata.xml b/kde-apps/libkcompactdisc/metadata.xml
index d925f24397..18d53b343a 100644
--- a/kde-apps/libkcompactdisc/metadata.xml
+++ b/kde-apps/libkcompactdisc/metadata.xml
@@ -7,5 +7,9 @@
</maintainer>
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
+ <remote-id type="kde-invent">multimedia/libkcompactdisc</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] 13+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/
@ 2024-01-07 22:01 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2024-01-07 22:01 UTC (permalink / raw
To: gentoo-commits
commit: 1ccc9eabce8b56099d2eb2d80b4797128921674a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 21:53:26 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 21:53:57 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1ccc9eab
kde-apps/libkcompactdisc: Block kde-apps/libkcompactdisc:5[-kf6compat(-)]
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/libkcompactdisc/libkcompactdisc-24.02.49.9999.ebuild | 4 +++-
kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-24.02.49.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-24.02.49.9999.ebuild
index d948f0df54..b5e40521ba 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-24.02.49.9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-24.02.49.9999.ebuild
@@ -22,7 +22,9 @@ DEPEND="
>=media-libs/phonon-4.12.0[qt6]
alsa? ( media-libs/alsa-lib )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index d948f0df54..b5e40521ba 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
@@ -22,7 +22,9 @@ DEPEND="
>=media-libs/phonon-4.12.0[qt6]
alsa? ( media-libs/alsa-lib )
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-01-07 22:01 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-17 13:40 [gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2024-01-07 22:01 Andreas Sturmlechner
2024-01-07 22:01 Andreas Sturmlechner
2023-12-09 11:59 Andreas Sturmlechner
2023-12-09 10:03 Andreas Sturmlechner
2021-04-15 20:03 Andreas Sturmlechner
2016-08-31 14:35 Michael Palimaka
2016-08-25 20:03 Michael Palimaka
2016-08-18 12:48 Michael Palimaka
2016-04-24 16:57 Michael Palimaka
2016-03-31 18:16 Johannes Huber
2015-10-01 11:25 Michael Palimaka
2015-09-10 18:15 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox