Only detect media-libs/portaudio if LIRC_DEVICES=audio is enabled, thus preventing build failures, see bug 251703 and bug 251522

(Portage version: 2.1.6.7/cvs/Linux i686)

4 files changed, 34 insertions, 8 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 9fad71e9443f..24c0b29f4202 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.197 2009/03/10 21:02:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.198 2009/03/13 09:17:24 fauli Exp $
+
+  13 Mar 2009; Christian Faulhammer <fauli@gentoo.org>
+  +files/lirc-0.8.4-portaudio_check.patch, lirc-0.8.4.ebuild,
+  lirc-0.8.4a.ebuild:
+  Only detect media-libs/portaudio if LIRC_DEVICES=audio is enabled, thus
+  preventing build failures, see bug 251703 and bug 251522
 
   10 Mar 2009; Steve Dibb <beandog@gentoo.org> lirc-0.8.4.ebuild,
   lirc-0.8.4a.ebuild:
diff --git a/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch b/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch
new file mode 100644
index 000000000000..36f5f360cd18
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch
@@ -0,0 +1,18 @@
+Portaudio is only needed for LIRC_DEVICES=audio, so not checking for Portaudio when the device is disabled will prevent automagic dependencies.
+--- configure.ac.orig	2009-03-13 10:02:50.000000000 +0100
++++ configure.ac	2009-03-13 10:04:00.000000000 +0100
+@@ -336,14 +336,6 @@
+   AC_DEFINE(HAVE_LIBIRMAN_SW)
+   possible_drivers="${possible_drivers} (irman_sw)"
+ )
+-dnl audio driver requires PortAudio library installed and some linker flags
+-AC_CHECK_HEADERS(portaudio.h,[
+-  AC_CHECK_LIB(portaudio, Pa_Initialize,[
+-    AC_DEFINE(HAVE_LIBPORTAUDIO)
+-    possible_drivers="${possible_drivers} (audio)"
+-    ],,${portaudio_lib_other}
+-  )]
+-)
+ dnl audio_alsa driver requires ALSA library installed and some linker flags
+ have_alsa=no
+ AC_CHECK_HEADERS(alsa/asoundlib.h,[
diff --git a/app-misc/lirc/lirc-0.8.4.ebuild b/app-misc/lirc/lirc-0.8.4.ebuild
index 96e11ed53307..a6b59e8f388d 100644
--- a/app-misc/lirc/lirc-0.8.4.ebuild
+++ b/app-misc/lirc/lirc-0.8.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/app-misc/lirc/lirc-0.8.4.ebuild,v 1.4 2009/03/10 21:02:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.4.ebuild,v 1.5 2009/03/13 09:17:24 fauli Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -217,11 +217,11 @@ pkg_setup() {
 	BUILD_TARGETS="all"
 
 	ECONF_PARAMS="	--localstatedir=/var
-			        --with-syslog=LOG_DAEMON
-			        --enable-sandboxed
-	    		    --with-kerneldir=${KV_DIR}
-			        --with-moduledir=/lib/modules/${KV_FULL}/misc
-	    		    $(use_enable debug)
+					--with-syslog=LOG_DAEMON
+					--enable-sandboxed
+					--with-kerneldir=${KV_DIR}
+					--with-moduledir=/lib/modules/${KV_FULL}/misc
+					$(use_enable debug)
 					$(use_with X x)
 					${MY_OPTS}"
 
@@ -244,6 +244,7 @@ src_unpack() {
 
 	# Apply patches needed for some special device-types
 	epatch "${FILESDIR}"/${P}-imon-pad2keys.patch
+	use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch
 	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
 
 	# remove parallel driver on SMP systems
diff --git a/app-misc/lirc/lirc-0.8.4a.ebuild b/app-misc/lirc/lirc-0.8.4a.ebuild
index 71f17f84f929..be10e20e785e 100644
--- a/app-misc/lirc/lirc-0.8.4a.ebuild
+++ b/app-misc/lirc/lirc-0.8.4a.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/app-misc/lirc/lirc-0.8.4a.ebuild,v 1.3 2009/03/10 21:02:47 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.4a.ebuild,v 1.4 2009/03/13 09:17:24 fauli Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -244,6 +244,7 @@ src_unpack() {
 
 	# Apply patches needed for some special device-types
 	epatch "${FILESDIR}"/${PN}-0.8.4-imon-pad2keys.patch
+	use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch
 	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
 
 	# remove parallel driver on SMP systems