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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 107 insertions, 18 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/Manifest b/kde-apps/kmix/Manifest
index 7ea1234b88c6..2fb53a51832c 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,25 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kmix-4.14.3-alsa-optional.patch 1677 SHA256 c7281e9cd51868a5ab66506686985710fd08e96772d80734a5ae41bb4c31f006 SHA512 3160d655a094c45c5ef2633cde6050e6077da6ec0381e2db442a1b442d5d70ccef8b644cfc3abfa76b8cf1b376a39e6a7a465b3d032cd270ae1da363ac312572 WHIRLPOOL cceea0e799c87637d63a521490466154d4aa493997353e158ae9be226a7eef2bd061049d7469223b2d0a5bbd5410f6725acfe7077f0a5ee81e5d9262c4908a69
 DIST kmix-4.14.3.tar.xz 379220 SHA256 d7dd97ad5ee005fa039696d88ce21a6ede2b5d795001f1d023899f5a848b6e94 SHA512 b4581a8f847618088b55710815c45a64fe22d1ea782aa57d8e724237cf4283a49d005e2c6389974e0587352d10da46718d7a696e4faafce63950288ab7b6cd62 WHIRLPOOL ac9ae7bb39d21de53eb2932720e2f0d7d6784b071343fd04a1c69de551b80a9993a6dc525c3c90643e6098bcfb6f3662dcfe4e5389194ed581cee066fca8d3e7
+EBUILD kmix-4.14.3-r1.ebuild 872 SHA256 eb01f0de3183f19b749fc8224b0140f53981ebf99c7ac4c4fe6867cb10259808 SHA512 cf4053d71c8211de1ee937b051351b7a77b3c4ddc19fc81849664e36c4e1b5b114b7fb464326fba6578612a801219f4f960bcc5cf8421b040e3391dd3f4c48c8 WHIRLPOOL 8283c254a8aa2ee8913583c51425d5e71fc85af8ffa499386de06987719361b6779aba1c84aa75631491349361d938a00ad21c333d377c817ba161571aa6d050
 EBUILD kmix-4.14.3.ebuild 801 SHA256 ea9ce02948b8f01c9b97f3a91c62a3ec40660fa8944db32127c37e8026198aa3 SHA512 6a2ba1759819fd77748b6f7e17f1557c0c28319a3108efc8798800b0ce8f9bfabc09e3b23a08403d71746bd18b191d638dbe417f1245017c78d8f39e8647d739 WHIRLPOOL cfb072e21b6fbd0f0836883de189c9251e77f0333acd460b64f64485f53ecaabeab2414454cf3501ecd6b2732718894ff91fe73bcfa5dbd4bbd686a3b2a5114c
-MISC ChangeLog 38813 SHA256 d54bafc89601adc999acb8a8a2a506147f061f6855457314a45881e2e3189f0a SHA512 0423eb83a441a21cae30f8e5971a75e839fdfdd99f40293008f0235b19b59f18312ec5fbe511669081587b9404c678830e040ca955ede5c46f283d0a6c9e15f9 WHIRLPOOL a2742b11e2ba69020d2eecd1ba5c73d7c241446e31516b3cbbc6ff4b75ad06ee06a37b57446372220f2613a2abb89b740261a3b7abea5519a6eab4b2628327a6
+MISC ChangeLog 39061 SHA256 15cf032a7f674e97a8716280eea050baa49bfe20235bc8602414a0a8e90bbe9d SHA512 490f66abf03dad006c03271a93bfe223a5ceb37e3f04760acaa7ae9c7e35f9d0f04c865637221ff0be95d030a4df15277705aabf835f206d46e702d6d9be4700 WHIRLPOOL cb13740d84c2dceb727ad941e947cbf10da2896c599a8cfda350e31b5b0f2c6d814ceea4db933ce5f2b4ed0b5cdff76cfa35adada733f33cca383d0043e6c125
 MISC metadata.xml 270 SHA256 49f6a167bc272706171518b8e2cc71f32fef62da26cf0262776dae93f6d0da49 SHA512 c3e6a83eabc8874fa0f941751e5cc9a0e0e56b8eb7de7b694750bf76d1fd79956d1a510e3dc290cf5f66b635c5eb5d0c5170a0ccb53cef881c5c741f2f560429 WHIRLPOOL 93c87c747eab6991d8c5ac166f2341e1e2624e4b47e718d195d7bfc8028868c01c5ea2d84a42d05d87bc5046aba0171537ed8f12e66946b2f9b835c30e9fafbe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJVcJ0QRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7GgXD/9ZpPD4Kk/q9XwIGeXmawY64RHclEEi1tU/cF3cPcs0HcY4gMy8m8g0niR/
-bMDJmc2N6ezJLlPGoP5y1To5KmjqArte7072LnCu+YG5zBt6pjAQ9VzAo74WT5Zx
-KKQn9g2Fp8luspH/IuUp2m8Kx2Mt/azkremHDYWpVtZLAxrFMhKwP2hvUndTR6JR
-fKLJq6DTB5yBr4zMuD1AtT8CLdqfdq6SFnJproCN9k9vRsTr47GDWWgskTiV8gKQ
-ofzc1VgdhMxPz85wE6Jwbgh9hRN8h03HLJ6R5c3rQABqEjLeFpPHZsvWDCSsJzgX
-5U1/rhfcwNXD+Z9XOHwET6BCVGh+dzNhHbTDjqfMtt0BRUN5epAeO/hD5Nu+tCrD
-KgHP59xEt7ap/M02sZ6G/a7OhE5Y7zcR4eHt8Uuii23VcFnjS6px7/4vKvpmFByv
-K5kwhD9+UOj65pJcxqNXVUkjchiSzKXYOZJXeGN5yYFhyq6lBwIn6Jlz1iTTAVOL
-/YjO+NGIh9dRhiVowGTraw64Z6WSZ1L0lILMML8gPjeE8cnne99kGrDEkMXAcgL7
-014tAAc8O7yIHJAKVhwaNRA/KlzDgVIx86HMf7iHKBuNAc0v6+ipyxhcGfh6PD4F
-WCf0V9+1JEW8S+rqfP82NsrNo8SdBHdndWQkJ4pnHULLylRMWg==
-=gAhd
+iQJ8BAEBCABmBQJVs7VZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODxsQAN0RTqcmF1ZtXPOYpMan28Wh
+8H8eDhDL8lDYYtx1bnbgcvaYPZWmY4+7xeHVE36qWRBCfnlzQYycdwrxtpbnvOxz
+TnF8ZXedFPrwotDtgG42gGy3iXJoz2hqyz4vn+lFdgqr6lcf+isqqeDRBwAos76f
+xXresrwnYlu4O4HevSnetdRSGGN5aY27In0R2CiQIrD+3um3imcAIPRXAzeuI3AX
+bm9LNVDBG0bgOnLqjtauh4tTP1mv9gXinSq8wxD8beokme2kP3ipOyJnalS7HFhq
+pjcivfwCXDgmIAZ00T37XnRoshxko8krtOSy/M995wLNZ3rvO5Nye58u0Cv947Yd
+J6afaeeUY0ehUywavx4y13WiN3zOraROCfm0CaSEHDcE1twsGBygQur3qecPk4so
+yK5g9nDzaFo+/t+PX2bVHmQi8LWsF+hUqfRYH4zgBh+tNcFaClyP434WtW3n5aW4
+sj2AtgeQVP8J405FEyA4fxFNC2mxPUDUH8jHPjMKKZf2TxaYlOjIbpNdqSDhYwOB
++Rr+7METQVcitNej0jcDVSUWU/pHHgmPMvO2U/MO5/VyrxyKDnMmT5/9CvzoInJ5
+M2CWi8c9XC8UdeHycS25WeWLFzVUsVyoCMgoJzdoa+8ZmcMyOq+JXaj9jYRGvK/F
+1QAkTYhTMcOTSrrjf9XT
+=GeSx
 -----END PGP SIGNATURE-----
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
+}