fixed asm/system.h migration issue caused by 3.3+ kernels, bug 439538

(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

3 files changed, 58 insertions, 2 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 1f387e8a828a..31afb03c97be 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/lirc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.232 2012/09/18 18:06:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.233 2012/10/24 18:39:12 axs Exp $
+
+  24 Oct 2012; Ian Stakenvicius <axs@gentoo.org> lirc-0.9.0-r2.ebuild,
+  +files/lirc-0.9.0-kernel-3.3.0-fixes.patch:
+  fixed asm/system.h migration issue caused by 3.3+ kernels, bug 439538
 
   18 Sep 2012; Pacho Ramos <pacho@gentoo.org> -files/lirc-0.8.6-send-evsyn.diff,
   -lirc-0.8.5.ebuild, -lirc-0.8.7_pre1.ebuild:
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch
new file mode 100644
index 000000000000..9b7d3ef1f539
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch
@@ -0,0 +1,50 @@
+diff -ur drivers/lirc_serial/lirc_serial.c drivers.new/lirc_serial/lirc_serial.c
+--- drivers/lirc_serial/lirc_serial.c	2011-03-25 18:28:18.000000000 -0400
++++ drivers.new/lirc_serial/lirc_serial.c	2012-10-24 14:32:14.000000000 -0400
+@@ -66,7 +66,12 @@
+ #include <linux/poll.h>
+ #include <linux/platform_device.h>
+ 
++#include "drivers/kcompat.h"
++#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0)
++#include <asm/switch_to.h>
++#else
+ #include <asm/system.h>
++#endif
+ #include <linux/io.h>
+ #include <linux/irq.h>
+ #include <linux/fcntl.h>
+@@ -80,7 +85,6 @@
+ #define UART_IE_IXP42X_UUE   0x40 /* IXP42X UART Unit enable */
+ #define UART_IE_IXP42X_RTOIE 0x10 /* IXP42X Receiver Data Timeout int.enable */
+ 
+-#include "drivers/kcompat.h"
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
+ #include <media/lirc.h>
+ #include <media/lirc_dev.h>
+diff -ur drivers/lirc_sir/lirc_sir.c drivers.new/lirc_sir/lirc_sir.c
+--- drivers/lirc_sir/lirc_sir.c	2011-03-25 18:28:18.000000000 -0400
++++ drivers.new/lirc_sir/lirc_sir.c	2012-10-24 14:32:46.000000000 -0400
+@@ -59,7 +59,14 @@
+ #include <linux/mm.h>
+ #include <linux/delay.h>
+ #include <linux/poll.h>
++
++#include "drivers/kcompat.h"
++#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0)
++#include <asm/switch_to.h>
++#else
+ #include <asm/system.h>
++#endif
++
+ #include <linux/io.h>
+ #include <asm/irq.h>
+ #include <linux/fcntl.h>
+@@ -74,7 +81,6 @@
+ 
+ #include <linux/timer.h>
+ 
+-#include "drivers/kcompat.h"
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
+ #include <media/lirc.h>
+ #include <media/lirc_dev.h>
diff --git a/app-misc/lirc/lirc-0.9.0-r2.ebuild b/app-misc/lirc/lirc-0.9.0-r2.ebuild
index 892217878dea..9bcc0eafc881 100644
--- a/app-misc/lirc/lirc-0.9.0-r2.ebuild
+++ b/app-misc/lirc/lirc-0.9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.3 2012/09/15 15:08:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.4 2012/10/24 18:39:12 axs Exp $
 
 EAPI=4
 
@@ -296,6 +296,8 @@ src_prepare() {
 	# Slightly massaged upstream patch to fix kfifo issues >=2.6.38
 	# for bug 377033
 	epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
+	# Apply fixes for kernel-3.3 and above (bug 439538)
+	epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch
 
 	# Do not build drivers from the top-level Makefile
 	sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am