Pull in changes from overlay; make ALSA optional

(Portage version: -svn/cvs/Linux i686)

3 files changed, 37 insertions, 8 deletions

diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
index 4e215f2db738..de85a090fdd8 100644
--- a/kde-base/phonon-kde/ChangeLog
+++ b/kde-base/phonon-kde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/phonon-kde
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.36 2009/12/10 23:45:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.37 2009/12/23 01:20:32 abcd Exp $
+
+  23 Dec 2009; Jonathan Callen <abcd@gentoo.org> phonon-kde-4.3.4.ebuild,
+  +files/phonon-kde-4.3.4-optional-alsa.patch:
+  Pull in changes from overlay; make ALSA optional
 
   10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   -phonon-kde-4.3.1.ebuild:
diff --git a/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch b/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch
new file mode 100644
index 000000000000..adc87db3fba6
--- /dev/null
+++ b/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch
@@ -0,0 +1,19 @@
+--- phonon-kde-4.3.4.orig/phonon/CMakeLists.txt
++++ phonon-kde-4.3.4/phonon/CMakeLists.txt
+@@ -14,6 +14,16 @@ else(KDE4_DISABLE_MULTIMEDIA)
+    macro_log_feature(_phonon_version_ok "Phonon" "Phonon library" "svn.kde.org/home/kde/trunk/kdesupport/phonon" TRUE "${PHONON_MIN_VERSION}" "STRONGLY RECOMMENDED: Required for playing audio and video throughout KDE")
+ 
+    FIND_PACKAGE(Alsa)
++
++   option(WITH_ALSA "Use ALSA, if found" ON)
++   if(NOT WITH_ALSA)
++      message(STATUS "Disabling ALSA support, by request")
++      set(ALSA_FOUND)
++      set(ASOUND_LIBRARY)
++      set(HAVE_LIBASOUND2)
++      set(ALSA_INCLUDES)
++   endif(NOT WITH_ALSA)
++
+    ALSA_CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
+ 
+    if(NOT ALSA_FOUND)
diff --git a/kde-base/phonon-kde/phonon-kde-4.3.4.ebuild b/kde-base/phonon-kde/phonon-kde-4.3.4.ebuild
index bb7eb86aaa88..80910b2c8ef8 100644
--- a/kde-base/phonon-kde/phonon-kde-4.3.4.ebuild
+++ b/kde-base/phonon-kde/phonon-kde-4.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.3.4.ebuild,v 1.1 2009/12/01 11:29:09 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.3.4.ebuild,v 1.2 2009/12/23 01:20:32 abcd Exp $
 
 EAPI="2"
 
@@ -13,18 +13,24 @@ HOMEPAGE="http://phonon.kde.org"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="GPL-2"
-IUSE="debug pulseaudio +xine"
+IUSE="alsa debug pulseaudio +xine"
 
 DEPEND="
-	media-libs/alsa-lib
 	media-sound/phonon[xine?]
+	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( media-sound/pulseaudio )
 "
 RDEPEND="${DEPEND}"
 
 add_blocker phonon-xine
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.4-optional-alsa.patch
+)
+
 src_prepare() {
+	kde4-meta_src_prepare
+
 	# Don't build tests - they require OpenGL
 	sed -e 's/add_subdirectory(tests)//' \
 		-i phonon/CMakeLists.txt || die "Failed to disable tests"
@@ -32,14 +38,14 @@ src_prepare() {
 	# Disable automagic
 	sed -e 's/find_package(Xine)/macro_optional_find_package(Xine)/' \
 		-i phonon/kcm/xine/CMakeLists.txt || die "Failed to make xine optional"
-
-	kde4-meta_src_prepare
 }
 
 src_configure() {
-	mycmakeargs="${mycmakeargs}
+	mycmakeargs=(
+		$(cmake-utils_use_with alsa)
 		$(cmake-utils_use_with pulseaudio PulseAudio)
-		$(cmake-utils_use_with xine)"
+		$(cmake-utils_use_with xine)
+	)
 
 	kde4-meta_src_configure
 }