finally fix 2.6 support

3 files changed, 60 insertions, 49 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 24a008391cc8..dceda28dbe6f 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.13 2003/12/29 16:04:03 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.14 2003/12/29 18:58:05 lanius Exp $
 
   29 Dec 2003; Sven Blumenstein <bazik@gentoo.org> lirc-0.6.6-r1.ebuild:
   Marked sparc to fix gxine depend.
 
+  29 Dec 2003; Heinrich Wendel <lanius@gentoo.org> lirc-0.7.0_pre2.ebuild:
+  finally fix kernel 2.6 support
+
   29 Nov 2003; Heinrich Wendel <lanius@gentoo.org> lirc-0.7.0_pre2.ebuild:
   fixed typo in LIRC_OPTS
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 1a321ce9a48c..9ba6b308b99a 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,6 +1,6 @@
 MD5 4d33b582f0dfe7a13688229730675c1e lirc-0.6.6-r1.ebuild 3878
-MD5 86dc3cf91f3aa557d72c2b434e506ca0 lirc-0.7.0_pre2.ebuild 4165
-MD5 f9e754ac55d464b023901be9b3db36b8 ChangeLog 2123
+MD5 48bd588e2583af85a926a3c93526a99d lirc-0.7.0_pre2.ebuild 4423
+MD5 15402aed2db4b7ea2dbf975f79bb6606 ChangeLog 2233
 MD5 eb1d5f40e0d59edbc1ac2a097cea5850 files/digest-lirc-0.6.6-r1 63
 MD5 75e7e1656176c823db004656b3fbd787 files/lircd 375
 MD5 cee0550f10a0a0d63fcae5209819f4d9 files/digest-lirc-0.7.0_pre2 67
diff --git a/app-misc/lirc/lirc-0.7.0_pre2.ebuild b/app-misc/lirc/lirc-0.7.0_pre2.ebuild
index 6d4cc3767f48..cb6e0b3a97d7 100644
--- a/app-misc/lirc/lirc-0.7.0_pre2.ebuild
+++ b/app-misc/lirc/lirc-0.7.0_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre2.ebuild,v 1.6 2003/11/29 21:24:29 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.7.0_pre2.ebuild,v 1.7 2003/12/29 18:58:05 lanius Exp $
 
 inherit eutils kernel-mod
 
@@ -76,14 +76,9 @@ src_compile() {
 	ewarn "make sure you have IrDA (infrared) support"
 	ewarn "in your kernel or this will fail"
 
-	#Let portage tell us where to put our modules
+	# Let portage tell us where to put our modules
 	check_KV
 
-	#
-	if kernel-mod_is_2_6_kernel; then
-		LIRC_OPTS="--with-driver=none"
-	fi
-
 	./configure \
 		--host=${CHOST} \
 		--prefix=/usr \
@@ -95,47 +90,58 @@ src_compile() {
 		--enable-sandboxed \
 		${LIRC_OPTS} || die "./configure failed"
 
-	emake || die
-
-	case ${LIRC_OPTS}
-	in
-	  *"any"*)
-		if [ "${SMP}" = 1 ]; then
-			# The parallel driver will not work with SMP kernels
-			# so we need to compile without it
-			emake -C drivers "SUBDIRS=lirc_dev lirc_serial \
-			lirc_sir lirc_it87 lirc_i2c lirc_gpio" || die
-		else
-			emake -C drivers "SUBDIRS=lirc_dev lirc_serial \
-			lirc_parallel lirc_sir lirc_it87 lirc_i2c \
-			lirc_gpio" || die
-		fi
-	;;
-	esac
+	if kernel-mod_is_2_6_kernel; then
+		(cd daemons; emake) || die
+		(cd tools; emake) || die
+	else
+		emake || die
+
+		case ${LIRC_OPTS}
+		in
+		  *"any"*)
+			if [ "${SMP}" = 1 ]; then
+				# The parallel driver will not work with SMP kernels
+				# so we need to compile without it
+				emake -C drivers "SUBDIRS=lirc_dev lirc_serial \
+				lirc_sir lirc_it87 lirc_i2c lirc_gpio" || die
+			else
+				emake -C drivers "SUBDIRS=lirc_dev lirc_serial \
+				lirc_parallel lirc_sir lirc_it87 lirc_i2c \
+				lirc_gpio" || die
+			fi
+		;;
+		esac
+	fi
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-
-	case ${LIRC_OPTS}
-	in
-	  *"any"*)
-		insinto /lib/modules/${KV}/misc
-		if [ "${SMP}" = 1 ]; then
-			for i in lirc_dev lirc_serial \
-				lirc_sir lirc_it87 lirc_i2c lirc_gpio
-			do
-			doins drivers/${i}/${i}.o
-			done
-		else
-			for i in lirc_dev lirc_serial \
-				lirc_parallel lirc_sir lirc_it87 lirc_i2c lirc_gpio
-			do
-			doins drivers/${i}/${i}.o
-			done
-		fi
-	;;
-	esac
+	if kernel-mod_is_2_6_kernel; then
+		(cd daemons; make DESTDIR=${D} install) || die
+		(cd tools; make DESTDIR=${D} install) || die
+	else
+		emake || die
+		make DESTDIR=${D} install || die
+
+		case ${LIRC_OPTS}
+		in
+		  *"any"*)
+			insinto /lib/modules/${KV}/misc
+			if [ "${SMP}" = 1 ]; then
+				for i in lirc_dev lirc_serial \
+					lirc_sir lirc_it87 lirc_i2c lirc_gpio
+				do
+				doins drivers/${i}/${i}.o
+				done
+			else
+				for i in lirc_dev lirc_serial \
+					lirc_parallel lirc_sir lirc_it87 lirc_i2c lirc_gpio
+				do
+				doins drivers/${i}/${i}.o
+				done
+			fi
+		;;
+		esac
+	fi
 
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/lircd
@@ -144,7 +150,9 @@ src_install() {
 }
 
 pkg_postinst () {
-	/usr/sbin/update-modules
+	if kernel-mod_is_2_4_kernel; then
+		/usr/sbin/update-modules
+	fi
 
 	einfo
 	einfo "The lirc Linux Infrared Remote Control Package has been"