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

2024-01-07 Thread Andreas Sturmlechner 
commit: 1ccc9eabce8b56099d2eb2d80b4797128921674a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  7 21:53:26 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  7 21:53:57 2024 +
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  gentoo.org>

 kde-apps/libkcompactdisc/libkcompactdisc-24.02.49..ebuild | 4 +++-
 kde-apps/libkcompactdisc/libkcompactdisc-.ebuild  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-24.02.49..ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-24.02.49..ebuild
index d948f0df54..b5e40521ba 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-24.02.49..ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-24.02.49..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-.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
index d948f0df54..b5e40521ba 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-.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=(

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

2024-01-07 Thread Andreas Sturmlechner 
commit: 7d8197615f0a8c26cc427b90bdca912ad3e8e757
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  7 21:52:43 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  7 21:53:57 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7d819761

kde-apps/libkcompactdisc: Add IUSE kf6compat

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../libkcompactdisc/libkcompactdisc-23.08.49..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..ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-23.08.49..ebuild
index 0f97da84b5..aef5eba758 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-23.08.49..ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-23.08.49..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 @@


https://bugs.kde.org/
+   multimedia/libkcompactdisc

+   
+   Disable components colliding with KF6, 
depend on KF6 components instead
+

[gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/, net-misc/kio-zeroconf/, kde-apps/libkexiv2/, ...

2023-12-16 Thread Andreas Sturmlechner 
commit: 9c671383bd33acdfdeee37afd48e58853a79e534
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 16 13:31:47 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 16 13:31:47 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c671383

*/*: Drop KDE_BLOCK_SLOT5, removed from gear.kde.org.eclass

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/audiocd-kio/audiocd-kio-.ebuild | 1 -
 kde-apps/libkcddb/libkcddb-.ebuild   | 1 -
 kde-apps/libkcompactdisc/libkcompactdisc-.ebuild | 1 -
 kde-apps/libkexiv2/libkexiv2-.ebuild | 1 -
 net-misc/kio-zeroconf/kio-zeroconf-.ebuild   | 1 -
 5 files changed, 5 deletions(-)

diff --git a/kde-apps/audiocd-kio/audiocd-kio-.ebuild 
b/kde-apps/audiocd-kio/audiocd-kio-.ebuild
index 26722622af..7b4dc07929 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KDE_BLOCK_SLOT5="false"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.245.0
 QTMIN=6.6.0

diff --git a/kde-apps/libkcddb/libkcddb-.ebuild 
b/kde-apps/libkcddb/libkcddb-.ebuild
index c8181decfd..ca11ab6a52 100644
--- a/kde-apps/libkcddb/libkcddb-.ebuild
+++ b/kde-apps/libkcddb/libkcddb-.ebuild
@@ -5,7 +5,6 @@ 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

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
index 96e60a1317..d392a03f0b 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
@@ -4,7 +4,6 @@
 EAPI=8
 
 ECM_TEST="true"
-KDE_BLOCK_SLOT5="false"
 KFMIN=5.245.0
 QTMIN=6.6.0
 inherit ecm gear.kde.org

diff --git a/kde-apps/libkexiv2/libkexiv2-.ebuild 
b/kde-apps/libkexiv2/libkexiv2-.ebuild
index 59a9291709..426eb94367 100644
--- a/kde-apps/libkexiv2/libkexiv2-.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-KDE_BLOCK_SLOT5="false"
 KFMIN=5.245.0
 QTMIN=6.6.0
 inherit ecm gear.kde.org

diff --git a/net-misc/kio-zeroconf/kio-zeroconf-.ebuild 
b/net-misc/kio-zeroconf/kio-zeroconf-.ebuild
index bc8c576f57..16befc13ed 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-KDE_BLOCK_SLOT5="false"
 KFMIN=5.245.0
 QTMIN=6.6.0
 inherit ecm gear.kde.org

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

2023-12-09 Thread Andreas Sturmlechner 
commit: 16300c6818a72488f450718e651b97aa4d9a3b89
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec  9 11:21:39 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec  9 11:21:39 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=16300c68

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

Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
index d392a03f0b..96e60a1317 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-.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

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

2023-12-09 Thread Andreas Sturmlechner 
commit: 2a75f54e6686f1e6696bf3e616d226f3dcfa7dd6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:34:09 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec  9 10:03:06 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a75f54e

kde-apps/libkcompactdisc: Port to KF6

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/libkcompactdisc/libkcompactdisc-.ebuild | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
index 09fd9758a9..d392a03f0b 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-.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}"

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

2021-04-15 Thread Andreas Sturmlechner 
commit: f3004806751a469caf5ffa6ec6731674377b7271
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 15 18:22:44 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr 15 20:03:03 2021 +
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  gentoo.org>

 kde-apps/libkcompactdisc/libkcompactdisc-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
index 4942ab1d2d..91c2659ad9 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-.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

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

2017-04-17 Thread Johannes Huber 
commit: ce0b1deed7af6d3bcc304e40c71f802ff712a010
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr 17 13:40:25 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Apr 17 13:40:25 2017 +
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

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

2017-04-17 Thread Andreas Sturmlechner 
commit: 33bbb5492895df1876e542e7c2695b6654f28951
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr 17 08:52:14 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr 17 09:10:59 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=33bbb549

kde-apps/libkcompactdisc: Proper patch after upstream input

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/libkcompactdisc-17.04.0-no-alsa.patch| 72 +-
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git 
a/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch 
b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
index 6bebf88e7c..1346f74044 100644
--- a/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
+++ b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
@@ -1,36 +1,52 @@
-commit bb427b44150e23e618209334d826d389b903ac8a
+commit 006fda07f559206f9f9f1ccc29080ce71a367b09
 Author: Andreas Sturmlechner 
 Date:   Sun Apr 16 21:23:58 2017 +0200
 
-Fix build without ALSA again
+Fix linking with ALSA
 
-Signed-off-by: Andreas Sturmlechner 
+REVIEW: 130089
 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b25c7d7..c89e9dd 100644
 a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -12,8 +12,10 @@ set_package_properties(ALSA PROPERTIES
-DESCRIPTION "ALSA provides audio and MIDI 
functionality"
-TYPE OPTIONAL
-PURPOSE "Play back audo CDs via ALSA")
--set(HAVE_ALSA ${ALSA_FOUND})
--configure_file(config-alsa.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
-+if(ALSA_FOUND)
-+add_definitions(-DHAVE_ALSA)
-+configure_file(config-alsa.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
-+endif(ALSA_FOUND)
+diff --git a/src/kcompactdisc.cpp b/src/kcompactdisc.cpp
+index 437648f..2e297d1 100644
+--- a/src/kcompactdisc.cpp
 b/src/kcompactdisc.cpp
+@@ -22,6 +22,8 @@
+ #include "kcompactdisc.h"
+ #include "kcompactdisc_p.h"
  
- set(wmlib_audio_SRCS
- wmlib/audio/audio.c
-@@ -79,8 +81,8 @@ target_link_libraries(KF5CompactDisc
- Phonon::phonon4qt5
- )
++#include 
++
+ #include 
+ #include 
+ #include 
+diff --git a/src/wmlib/audio/audio.c b/src/wmlib/audio/audio.c
+index 9ed7a82..729ada5 100644
+--- a/src/wmlib/audio/audio.c
 b/src/wmlib/audio/audio.c
+@@ -19,9 +19,8 @@
+ #include "audio.h"
+ #include "../include/wm_config.h"
  
--if (HAVE_ALSA)
--target_link_libraries(KF5CompactDisc ${ALSA_LIBRARY})
-+if (ALSA_FOUND)
-+target_link_libraries(KF5CompactDisc ${ALSA_LIBRARIES})
- endif ()
+-#ifdef HAVE_ALSA
+ #include 
+-#endif
++
+ #include 
  
- if (USE_WMLIB)
+ struct audio_oops *setup_phonon(const char *dev, const char *ctl);
+diff --git a/src/wmlib/audio/audio_alsa.c b/src/wmlib/audio/audio_alsa.c
+index 87bbca5..af1a1cb 100644
+--- a/src/wmlib/audio/audio_alsa.c
 b/src/wmlib/audio/audio_alsa.c
+@@ -26,9 +26,10 @@
+ #include "../include/wm_struct.h"
+ #include "../include/wm_config.h"
+ 
++#include 
++
+ #ifdef HAVE_ALSA
+ 
+-#include 
+ #include 
+ 
+ static char *device = NULL;

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

2017-04-16 Thread Andreas Sturmlechner 
commit: 9a8b5e7ac652dba8749de23792f2256d96091755
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 16 20:18:22 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 16 20:18:22 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9a8b5e7a

kde-apps/libkcompactdisc: Fix ALSA linking as well

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/libkcompactdisc-17.04.0-no-alsa.patch| 23 ++
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git 
a/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch 
b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
index e2bb2c11d3..6bebf88e7c 100644
--- a/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
+++ b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
@@ -1,21 +1,36 @@
-commit 082b1637c6720a0955855a92a037cd033568ddf1
+commit bb427b44150e23e618209334d826d389b903ac8a
 Author: Andreas Sturmlechner 
 Date:   Sun Apr 16 21:23:58 2017 +0200
 
 Fix build without ALSA again
+
+Signed-off-by: Andreas Sturmlechner 
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b25c7d7..c32f1f7 100644
+index b25c7d7..c89e9dd 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -13,7 +13,9 @@ set_package_properties(ALSA PROPERTIES
+@@ -12,8 +12,10 @@ set_package_properties(ALSA PROPERTIES
+DESCRIPTION "ALSA provides audio and MIDI 
functionality"
 TYPE OPTIONAL
 PURPOSE "Play back audo CDs via ALSA")
- set(HAVE_ALSA ${ALSA_FOUND})
+-set(HAVE_ALSA ${ALSA_FOUND})
 -configure_file(config-alsa.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
 +if(ALSA_FOUND)
++add_definitions(-DHAVE_ALSA)
 +configure_file(config-alsa.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
 +endif(ALSA_FOUND)
  
  set(wmlib_audio_SRCS
  wmlib/audio/audio.c
+@@ -79,8 +81,8 @@ target_link_libraries(KF5CompactDisc
+ Phonon::phonon4qt5
+ )
+ 
+-if (HAVE_ALSA)
+-target_link_libraries(KF5CompactDisc ${ALSA_LIBRARY})
++if (ALSA_FOUND)
++target_link_libraries(KF5CompactDisc ${ALSA_LIBRARIES})
+ endif ()
+ 
+ if (USE_WMLIB)

[gentoo-commits] proj/kde:master commit in: kde-apps/libkcompactdisc/files/, kde-apps/libkcompactdisc/

2017-04-16 Thread Andreas Sturmlechner 
commit: 033dbcfea987a71075f03504be723e4b9826a60d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 16 19:34:01 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 16 19:34:19 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=033dbcfe

kde-apps/libkcompactdisc: Fix USE=-alsa, add missing RDEPEND

Gentoo-bug: 615776

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/libkcompactdisc-17.04.0-no-alsa.patch | 21 +
 ...4.0.ebuild => libkcompactdisc-17.04.0-r1.ebuild} |  6 --
 .../libkcompactdisc-17.04.49..ebuild|  4 ++--
 .../libkcompactdisc/libkcompactdisc-.ebuild |  4 ++--
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git 
a/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch 
b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
new file mode 100644
index 00..e2bb2c11d3
--- /dev/null
+++ b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
@@ -0,0 +1,21 @@
+commit 082b1637c6720a0955855a92a037cd033568ddf1
+Author: Andreas Sturmlechner 
+Date:   Sun Apr 16 21:23:58 2017 +0200
+
+Fix build without ALSA again
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b25c7d7..c32f1f7 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -13,7 +13,9 @@ set_package_properties(ALSA PROPERTIES
+TYPE OPTIONAL
+PURPOSE "Play back audo CDs via ALSA")
+ set(HAVE_ALSA ${ALSA_FOUND})
+-configure_file(config-alsa.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
++if(ALSA_FOUND)
++configure_file(config-alsa.h.cmake 
${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
++endif(ALSA_FOUND)
+ 
+ set(wmlib_audio_SRCS
+ wmlib/audio/audio.c

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0-r1.ebuild
similarity index 80%
rename from kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild
rename to kde-apps/libkcompactdisc/libkcompactdisc-17.04.0-r1.ebuild
index 638a382f7d..d6863f4e17 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0-r1.ebuild
@@ -13,17 +13,19 @@ 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]
+   alsa? ( media-libs/alsa-lib )
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-no-alsa.patch" )
+
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use_find_package alsa Alsa)
+   $(cmake-utils_use_find_package alsa ALSA)
)
kde5_src_configure
 }

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.49..ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.49..ebuild
index cc67f12f0d..13a932d522 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.49..ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.49..ebuild
@@ -13,17 +13,17 @@ 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]
+   alsa? ( media-libs/alsa-lib )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use_find_package alsa Alsa)
+   $(cmake-utils_use_find_package alsa ALSA)
)
kde5_src_configure
 }

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
index cc67f12f0d..13a932d522 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
@@ -13,17 +13,17 @@ 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]
+   alsa? ( media-libs/alsa-lib )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
local mycmakeargs=(
-   $(cmake-utils_use_find_package alsa Alsa)
+   $(cmake-utils_use_find_package alsa ALSA)
)
kde5_src_configure
 }

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

2016-08-31 Thread Michael Palimaka 
commit: f32adae6f16d514dcb1f4b790a9dbb3eb9319521
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Aug 27 20:22:59 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Aug 31 14:35:18 2016 +
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-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
index b46acab..eef3349 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=6
 
+KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="Library for playing & ripping CDs"

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

2016-08-25 Thread Michael Palimaka 
commit: 2c17235429cd637042843eb6fd4b41941acae2d1
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Aug 25 20:00:05 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Aug 25 20:03:38 2016 +
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-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
index 90dd6ac..b46acab 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
@@ -7,6 +7,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Library for playing & ripping CDs"
+LICENSE="GPL-2+ LGPL-2+"
 KEYWORDS=""
 IUSE="alsa"

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

2016-08-18 Thread Michael Palimaka 
commit: d0513bfd2b9b84d9ad1848f94493c3499cd06051
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Tue Aug 16 06:25:52 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Aug 18 12:48:50 2016 +
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..ebuild  | 29 --
 .../libkcompactdisc/libkcompactdisc-.ebuild| 16 +++-
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild
deleted file mode 100644
index fc089d8..000
--- a/kde-apps/libkcompactdisc/libkcompactdisc-5..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-.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
index a1b37f3..90dd6ac 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-.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
 }

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

2016-04-24 Thread Michael Palimaka 
commit: f87559adbf2d2703d92160ec74e63acf9097155f
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Apr 24 12:59:12 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Apr 24 16:56:22 2016 +
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..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild
index 22b025b..fc089d8 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-5..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
 }

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

2016-03-31 Thread Johannes Huber 
commit: c292941b9fdac830c334d2f45243fdf5f13c91be
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Mar 31 18:09:53 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Mar 31 18:09:53 2016 +
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..ebuild | 2 +-
 kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild| 2 +-
 kde-apps/libkcompactdisc/libkcompactdisc-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-16.04.49..ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-16.04.49..ebuild
index a56d284..a1b37f3 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-16.04.49..ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-16.04.49..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..ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild
index 638ec05..22b025b 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-5..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-.ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
index a56d284..a1b37f3 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde4-base

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

2015-10-01 Thread Michael Palimaka 
commit: f5f8e04a9486fb8cafb351159ffd8c7514f1455f
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Oct  1 10:02:39 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct  1 11:25:19 2015 +
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..ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild
index 2ac175b..ee80fa9 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-5..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]

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

2015-09-10 Thread Michael Palimaka 
commit: 2da03cac6abe542cdbcb9c27f03a8d6b467fed2a
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Fri Sep  4 18:18:55 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep 10 18:15:48 2015 +
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..ebuild  | 28 ++
 1 file changed, 28 insertions(+)

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild 
b/kde-apps/libkcompactdisc/libkcompactdisc-5..ebuild
new file mode 100644
index 000..2ac175b
--- /dev/null
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-5..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
+}