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

[Andreas Sturmlechner]

commit:     842ddf8b02284b037ee18088ce5935bf2065a8bc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 19:21:48 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 19:36:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=842ddf8b

kde-apps/libkcompactdisc: Restore linking to media-libs/alsa-lib

At the same time, fix USE=-alsa

Gentoo-bug: 615776

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/libkcompactdisc-16.12.3-no-alsa.patch    | 22 +++++++++++++++
 .../libkcompactdisc-16.12.3-r1.ebuild              | 33 ++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/kde-apps/libkcompactdisc/files/libkcompactdisc-16.12.3-no-alsa.patch b/kde-apps/libkcompactdisc/files/libkcompactdisc-16.12.3-no-alsa.patch
new file mode 100644
index 00000000000..3fceacc9e3f
--- /dev/null
+++ b/kde-apps/libkcompactdisc/files/libkcompactdisc-16.12.3-no-alsa.patch
@@ -0,0 +1,22 @@
+commit 6509952dd6eff48d608a0e4124fa771bfaf53b53
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
+Date:   Sun Apr 16 21:09:55 2017 +0200
+
+    Fix build without ALSA again
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 30e6a98..fb79bdd 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -7,7 +7,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ endif()
+ 
+ find_package(Alsa)
+-alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
++if(ALSA_FOUND)
++    alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
++    add_definitions(-DHAVE_LIBASOUND2)
++endif(ALSA_FOUND)
+ 
+ set(wmlib_audio_SRCS
+         wmlib/audio/audio.c

diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-16.12.3-r1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-16.12.3-r1.ebuild
new file mode 100644
index 00000000000..fd4684fa6a7
--- /dev/null
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-16.12.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Library for playing & ripping CDs"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="alsa"
+
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	media-libs/phonon[qt5]
+	alsa? ( media-libs/alsa-lib )
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdelibs4support)
+"
+
+PATCHES=( "${FILESDIR}/${P}-no-alsa.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package alsa Alsa)
+	)
+	kde5_src_configure
+}