http://bugs.gentoo.org/show_bug.cgi?id=64356

5 files changed, 36 insertions, 6 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 6060fce0c819..0f1a06de2533 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.38 2004/09/16 15:18:51 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.39 2004/09/25 15:10:07 lanius Exp $
+
+  25 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  +files/lirc-0.7.0_pre7-configure.patch, lirc-0.7.0_pre7-r1.ebuild,
+  lirc-0.7.0_pre7.ebuild:
+  fix typo in configure that leads to a compile error, bug #64356
 
 *lirc-0.7.0_pre7-r1 (16 Sep 2004)
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index b8f32609e41c..d159c4ebecd8 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,10 +1,10 @@
 MD5 6ea46a8f53247afcc0e5566e20a97270 lirc-0.7.0_pre6.ebuild 4619
-MD5 3d5b9164e91ba1fdff39f114486a65d5 lirc-0.7.0_pre7-r1.ebuild 3547
+MD5 c890111abb655df1d42511133434c06f lirc-0.7.0_pre7-r1.ebuild 3588
 MD5 9dec01b704006290727d5bf8d5c7fb3b lirc-0.7.0_pre3.ebuild 4430
-MD5 0c682aefe773bda202c3a6305372bf20 lirc-0.7.0_pre7.ebuild 3477
+MD5 c962c4d825570a93639d16be73b2e09f lirc-0.7.0_pre7.ebuild 3518
 MD5 39e8c8029290c82b23eb12334f1a2800 lirc-0.6.6-r1.ebuild 3853
 MD5 81130c567a1cb8a47c8c4934171c5526 lirc-0.7.0_pre4.ebuild 4490
-MD5 391d7a69df68f5f80c444d8b961c747c ChangeLog 5374
+MD5 2d7b525b1c353b3e4f7da1db006f1297 ChangeLog 5587
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 eb1d5f40e0d59edbc1ac2a097cea5850 files/digest-lirc-0.6.6-r1 63
 MD5 d0d865cbe48f328fb4cfb41e22d4407b files/lirc-0.7.0_pre2-i2c.patch.gz 705
@@ -17,5 +17,6 @@ MD5 556773de652aa24339c9807015e154a9 files/digest-lirc-0.7.0_pre7 154
 MD5 be33063742c7eabaad1d246784472aae files/lircmd 381
 MD5 556773de652aa24339c9807015e154a9 files/digest-lirc-0.7.0_pre7-r1 154
 MD5 6031968a1ddb51ff5265d1f22bd2d237 files/lirc-0.6.6-gentoo.diff.bz2 2215
+MD5 deb700405f78459561856d13837fdd7c files/lirc-0.7.0_pre7-configure.patch 924
 MD5 ab567186b553096440ee53918e52b867 files/lirc-0.7.0_pre7-streamzap.patch.bz2 10724
 MD5 ee2b49c33fb3b2a65122cfc698d9e100 files/xbox-lircd.conf 784
diff --git a/app-misc/lirc/files/lirc-0.7.0_pre7-configure.patch b/app-misc/lirc/files/lirc-0.7.0_pre7-configure.patch
new file mode 100644
index 000000000000..d42907d0ca57
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.7.0_pre7-configure.patch
@@ -0,0 +1,22 @@
+--- configure.orig	2004-09-22 04:45:45.000000000 +0200
++++ configure	2004-09-22 04:46:38.000000000 +0200
+@@ -7823,7 +7823,7 @@
+ 
+ possible_drivers="(none) (bte) (creative_infracd) (devinput) (dsp) \
+ 	(exaudio) (irreal) (livedrive_midi) (livedrive_seq) (logitech) \
+-	(mediafocusI) (mp3anywhere) (pcmak) (pcmak_usb) (pctv) |
++	(mediafocusI) (mp3anywhere) (pcmak) (pcmak_usb) (pctv) \
+ 	(remotemaster) (silitek) (slinke) (tira) (uirt2) (uirt2_raw) \
+ 	(udp)"
+ 
+--- configure.in.orig	2004-09-22 04:46:15.000000000 +0200
++++ configure.in	2004-09-22 04:47:05.000000000 +0200
+@@ -137,7 +137,7 @@
+ 
+ possible_drivers="(none) (bte) (creative_infracd) (devinput) (dsp) \
+ 	(exaudio) (irreal) (livedrive_midi) (livedrive_seq) (logitech) \
+-	(mediafocusI) (mp3anywhere) (pcmak) (pcmak_usb) (pctv) |
++	(mediafocusI) (mp3anywhere) (pcmak) (pcmak_usb) (pctv) \
+ 	(remotemaster) (silitek) (slinke) (tira) (uirt2) (uirt2_raw) \
+ 	(udp)"
+ 
diff --git a/app-misc/lirc/lirc-0.7.0_pre7-r1.ebuild b/app-misc/lirc/lirc-0.7.0_pre7-r1.ebuild
index 7ea916846e79..3d05fa2c1b86 100644
--- a/app-misc/lirc/lirc-0.7.0_pre7-r1.ebuild
+++ b/app-misc/lirc/lirc-0.7.0_pre7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre7-r1.ebuild,v 1.2 2004/09/17 18:29:49 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre7-r1.ebuild,v 1.3 2004/09/25 15:10:07 lanius Exp $
 
 inherit eutils kmod
 
@@ -58,6 +58,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${DISTDIR}/01-add-2.6-devfs-and-sysfs-to-lirc_dev.patch
 	epatch ${FILESDIR}/lirc-0.7.0_pre7-streamzap.patch.bz2
+	epatch ${FILESDIR}/${P}-configure.patch
 	sed	-i -e "s:-O2 -g:${CFLAGS}:" configure configure.in
 }
 
diff --git a/app-misc/lirc/lirc-0.7.0_pre7.ebuild b/app-misc/lirc/lirc-0.7.0_pre7.ebuild
index e47d3221ec0c..0bcfd1a9c7be 100644
--- a/app-misc/lirc/lirc-0.7.0_pre7.ebuild
+++ b/app-misc/lirc/lirc-0.7.0_pre7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre7.ebuild,v 1.7 2004/09/16 15:18:51 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre7.ebuild,v 1.8 2004/09/25 15:10:07 lanius Exp $
 
 inherit eutils kmod
 
@@ -57,6 +57,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${DISTDIR}/01-add-2.6-devfs-and-sysfs-to-lirc_dev.patch
+	epatch ${FILESDIR}/${P}-configure.patch
 	sed	-i -e "s:-O2 -g:${CFLAGS}:" configure configure.in
 }