Fix automagic dep on alsa. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/173 by a17r.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

3 files changed, 88 insertions, 2 deletions

diff --git a/kde-apps/kmix/ChangeLog b/kde-apps/kmix/ChangeLog
index ca0d629fbb3c..41c305d3a417 100644
--- a/kde-apps/kmix/ChangeLog
+++ b/kde-apps/kmix/ChangeLog
@@ -1,6 +1,13 @@
-# ChangeLog for kde-base/kmix
+# ChangeLog for kde-apps/kmix
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-apps/kmix/ChangeLog,v 1.1 2015/06/04 18:44:40 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kmix/ChangeLog,v 1.2 2015/07/25 16:12:08 mgorny Exp $
+
+*kmix-4.14.3-r1 (25 Jul 2015)
+
+  25 Jul 2015; Michał Górny <mgorny@gentoo.org>
+  +files/kmix-4.14.3-alsa-optional.patch, +kmix-4.14.3-r1.ebuild:
+  Fix automagic dep on alsa. https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/173 by a17r.
 
   18 Feb 2015; Michał Górny <mgorny@gentoo.org> -kmix-4.12.5.ebuild:
   Remove KDE SC 4.12
diff --git a/kde-apps/kmix/files/kmix-4.14.3-alsa-optional.patch b/kde-apps/kmix/files/kmix-4.14.3-alsa-optional.patch
new file mode 100644
index 000000000000..4f620fbac828
--- /dev/null
+++ b/kde-apps/kmix/files/kmix-4.14.3-alsa-optional.patch
@@ -0,0 +1,47 @@
+commit 233f93b01ff05349793a8a2786750a2195f257ab
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sat Jul 11 15:48:35 2015 +0200
+
+    Fix build w/ optional alsa, make HAVE_LIBASOUND2 work
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c829005..17c106d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,8 +9,6 @@ include(MacroLibrary)
+ # Do not yet REQUIRE Phonon. Hint: As long as we do not find_package(), ${KDE4_PHONON_LIBS} will be empty below, but that should not hurt.
+ #find_package(Phonon REQUIRED)
+ 
+-find_package(Alsa)
+-
+ set(PA_VER "0.9.16")
+ macro_optional_find_package(PulseAudio "${PA_VER}")
+ macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "PulseAudio Audio Server"
+@@ -20,8 +18,11 @@ macro_optional_find_package(Canberra)
+ macro_log_feature(CANBERRA_FOUND "libcanberra" "libcanberra audio library"
+     "http://0pointer.de/lennart/projects/libcanberra/" FALSE "" "libcanberra is needed for kmix sound feedback")
+ 
+-alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
+-
++find_package(Alsa)
++if(ALSA_FOUND)
++    alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++    add_definitions(-DHAVE_LIBASOUND2)
++endif(ALSA_FOUND)
+ 
+ add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} )
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=67100)
+diff --git a/backends/kmix-backends.cpp b/backends/kmix-backends.cpp
+index 14ecfb3..1397099 100644
+--- a/backends/kmix-backends.cpp
++++ b/backends/kmix-backends.cpp
+@@ -23,7 +23,9 @@
+ /* This code is being #include'd from mixer.cpp */
+ 
+ #include <config.h>
++#ifdef HAVE_LIBASOUND2
+ #include <config-alsa.h>
++#endif
+ 
+ #include "mixer_backend.h"
+ #include "core/mixer.h"
diff --git a/kde-apps/kmix/kmix-4.14.3-r1.ebuild b/kde-apps/kmix/kmix-4.14.3-r1.ebuild
new file mode 100644
index 000000000000..057fff4119b8
--- /dev/null
+++ b/kde-apps/kmix/kmix-4.14.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kmix/kmix-4.14.3-r1.ebuild,v 1.1 2015/07/25 16:12:08 mgorny Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE mixer gui"
+HOMEPAGE="http://www.kde.org/applications/multimedia/kmix/"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa debug canberra pulseaudio"
+
+DEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	canberra? ( media-libs/libcanberra )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.12 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.14.3-alsa-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package alsa)
+		$(cmake-utils_use_with canberra)
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+	)
+
+	kde4-base_src_configure
+}