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

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

[Andreas Sturmlechner]

commit:     033dbcfea987a71075f03504be723e4b9826a60d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 19:34:01 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 19:34:19 2017 +0000
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.9999.ebuild            |  4 ++--
 .../libkcompactdisc/libkcompactdisc-9999.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 0000000000..e2bb2c11d3
--- /dev/null
+++ b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
@@ -0,0 +1,21 @@
+commit 082b1637c6720a0955855a92a037cd033568ddf1
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+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.9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.49.9999.ebuild
index cc67f12f0d..13a932d522 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.49.9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.49.9999.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-9999.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
index cc67f12f0d..13a932d522 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-9999.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-9999.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
 }