clean up, hopefully without breaking anything

(Portage version: 2.1.6.7/cvs/Linux i686)

18 files changed, 0 insertions, 1673 deletions

diff --git a/app-misc/lirc/files/lirc-0.8.0-conf-pixelview_bt878.diff b/app-misc/lirc/files/lirc-0.8.0-conf-pixelview_bt878.diff
deleted file mode 100644
index 75b3b11af07a..000000000000
--- a/app-misc/lirc/files/lirc-0.8.0-conf-pixelview_bt878.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2006-08-04 12:39:08.000000000 +0200
-+++ configure.in	2006-08-04 12:44:41.000000000 +0200
-@@ -909,7 +909,7 @@
- 
- if test "$driver" = "pixelview_bt878"; then
-   lirc_driver="lirc_dev lirc_i2c"
--  lircd_conf="pixelview/lircd.conf.pixelview_bt878"
-+  lircd_conf="pixelview/lircd.conf.playtv_bt878"
- #  lircmd_conf="pixelview/lircmd.conf.pixelview_bt878"
- fi
- 
diff --git a/app-misc/lirc/files/lirc-0.8.0-i2c-kernel-2.6.17.diff b/app-misc/lirc/files/lirc-0.8.0-i2c-kernel-2.6.17.diff
deleted file mode 100644
index 435cffa92a7e..000000000000
--- a/app-misc/lirc/files/lirc-0.8.0-i2c-kernel-2.6.17.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- drivers/lirc_i2c/lirc_i2c.c	2006/03/04 23:16:03	1.36
-+++ drivers/lirc_i2c/lirc_i2c.c	2006/06/26 23:21:34	1.38
-@@ -430,12 +430,19 @@
- 		break;
- 	case 0x18:
- 	case 0x1a:
--		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) {
-+#ifdef I2C_HW_B_CX2341X
-+		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
-+		    adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X))
-+#else
-+		if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
-+#endif
-+		{
- 			strcpy(ir->c.name,"Hauppauge IR");
- 			ir->l.code_length = 13;
- 			ir->l.add_to_buf=add_to_buf_haup;
- 		}
--		else {
-+		else /* I2C_HW_B_CX2388x */
-+		{
- 			strcpy(ir->c.name,"Leadtek IR");
- 			ir->l.code_length = 8;
- 			ir->l.add_to_buf=add_to_buf_pvr2000;
-@@ -508,7 +515,13 @@
- 		-1};
- 	struct i2c_client c; char buf; int i,rc;
- 
--	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) {
-+#ifdef I2C_HW_B_CX2341X
-+	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848) ||
-+	    adap->id == (I2C_ALGO_BIT | I2C_HW_B_CX2341X))
-+#else
-+	if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
-+#endif
-+	{
- 		memset(&c,0,sizeof(c));
- 		c.adapter = adap;
- 		for (i = 0; -1 != probe[i]; i++) {
diff --git a/app-misc/lirc/files/lirc-0.8.0-imon-pad2keys.patch b/app-misc/lirc/files/lirc-0.8.0-imon-pad2keys.patch
deleted file mode 100644
index 6898493e7139..000000000000
--- a/app-misc/lirc/files/lirc-0.8.0-imon-pad2keys.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-Downloaded from http://www.brakemeier.de/
-
-diff -uBbwr lirc-0.8.0/drivers/lirc_imon/lirc_imon.c lirc-0.8.0-imon-pad2keys/drivers/lirc_imon/lirc_imon.c
---- lirc-0.8.0/drivers/lirc_imon/lirc_imon.c	2005-12-03 16:18:07.000000000 +0100
-+++ lirc-0.8.0-imon-pad2keys/drivers/lirc_imon/lirc_imon.c	2006-03-31 19:06:00.000000000 +0200
-@@ -65,10 +65,27 @@
- #include "drivers/lirc_dev/lirc_dev.h"
- 
- 
-+// imon pad2keys patch
-+//
-+// make PAD and mouse buttons available for use with VDR,
-+// based on pad-mouse-emu patch from venky's forum
-+//
-+// M.Brakemeier 2006-03-31
-+//
-+// generated PAD key codes:
-+// Mouse_N                  0x690281B7
-+// Mouse_S                  0x688291B7
-+// Mouse_W                  0x6A8281B7
-+// Mouse_E                  0x688A81B7
-+//
-+// mouse buttons (non-synthetic):
-+// MouseRightClick          0x688481B7
-+// MouseLeftClick           0x688301B7
-+
- #define MOD_AUTHOR	"Venky Raju <dev@venky.ws>"
--#define MOD_DESC	"Driver for Soundgraph iMON MultiMedian IR/VFD"
-+#define MOD_DESC	"Driver for Soundgraph iMON MultiMedian IR/VFD w/imon pad2keys patch"
- #define MOD_NAME	"lirc_imon"
--#define MOD_VERSION	"0.3"
-+#define MOD_VERSION	"0.3p2k"
- 
- #define VFD_MINOR_BASE	144	/* Same as LCD */
- #define DEVFS_MODE	S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
-@@ -83,6 +100,7 @@
- #define	TRUE		1
- #define FALSE		0
- 
-+#define CURSOR_LIMIT    16
- 
- /* ------------------------------------------------------------
-  *                     P R O T O T Y P E S
-@@ -161,6 +179,10 @@
- 		atomic_t busy;		     /* write in progress         */
- 		int status;		     /* status of tx completion   */
- 	} tx;
-+
-+    int key_x;
-+    int key_y;
-+    int last_count;                      /* number of times pressed   */
- };
- 
- #define LOCK_CONTEXT	down (&context ->sem)
-@@ -251,6 +273,7 @@
- 
- MODULE_AUTHOR (MOD_AUTHOR);
- MODULE_DESCRIPTION (MOD_DESC);
-+MODULE_VERSION(MOD_VERSION);    /* MBr: was missing */
- MODULE_LICENSE ("GPL");
- module_param (debug, int, 0);
- MODULE_PARM_DESC (debug, "Debug messages: 0=no, 1=yes (default: no)");
-@@ -575,6 +598,11 @@
- 	context ->rx.initial_space = 1;
- 	context ->rx.prev_bit = 0;
- 
-+        /* init pad context */
-+        context ->key_x = 0;
-+        context ->key_y = 0;
-+        context ->last_count = 0;
-+
- 	usb_fill_int_urb (context ->rx_urb, context ->dev,
- 		usb_rcvintpipe (context ->dev,
- 				context ->rx_endpoint-> bEndpointAddress),
-@@ -705,6 +733,76 @@
- 
- 		/* The signals have been decoded onboard the iMON controller */
- 
-+    	        /* encode mouse pad as key events */
-+    	        /* we like pad events, not mouse button events*/
-+    	        if((buf[0] & 0x40) &&
-+                   !(buf[1] & 0x01 || buf[1] >> 2 & 0x01))
-+                {
-+                    int rel_x = (buf[1] & 0x08) | (buf[1] & 0x10) >> 2 | (buf[1] & 0x20) >> 4 | (buf[1] & 0x40) >> 6;
-+                    int rel_y = (buf[2] & 0x08) | (buf[2] & 0x10) >> 2 | (buf[2] & 0x20) >> 4 | (buf[2] & 0x40) >> 6;
-+
-+                    if(buf[0] & 0x02)
-+                        rel_x |= ~0x10+1;
-+                    if(buf[0] & 0x01)
-+                        rel_y |= ~0x10+1;
-+
-+                    /* keyboard direction key emulation */
-+                    if( context->last_count > 32 )
-+                    {  /* Hopefully eliminate drift*/
-+                        context->last_count=0;
-+                        context->key_y=0;
-+                        context->key_x=0;
-+                    }
-+                    context->last_count++;
-+
-+                    /* limit decoded events */
-+                    if(abs(context->key_x) > CURSOR_LIMIT || abs(context->key_y) > CURSOR_LIMIT )
-+                    {
-+                        if(abs(context->key_y ) > abs(context->key_x))
-+                        { /* mouse s/n */
-+                            if(context->key_y > 0 && rel_y > 0)
-+                            { /* mouse s */
-+                                buf[0] = 0x68;
-+                                buf[1] = 0x82;
-+                                buf[2] = 0x91;
-+                            }
-+                            else if(context->key_y < 0 && rel_y < 0)
-+                            { /* mouse n */
-+                                buf[0] = 0x69;
-+                                buf[1] = 0x02;
-+                                buf[2] = 0x81;
-+                            }
-+                        }
-+                        else
-+                        { /* mouse e/w*/
-+                            if(context->key_x > 0 && rel_x > 0 )
-+                            { /* mouse e */
-+                                buf[0] = 0x68;
-+                                buf[1] = 0x8A;
-+                                buf[2] = 0x81;
-+                            }
-+                            else if(context->key_x < 0 && rel_x < 0  )
-+                            { /* mouse w */
-+                                buf[0] = 0x6A;
-+                                buf[1] = 0x82;
-+                                buf[2] = 0x81;
-+                            }
-+                        }
-+                    }
-+                    else
-+                    {
-+                        context->key_x += rel_x;
-+                        context->key_y += rel_y;
-+
-+                        return; /* discard those key codes */
-+                    }
-+                }
-+
-+                /* a key was pressed, reset count */
-+                context->key_x = 0;
-+                context->key_y = 0;
-+                context->last_count = 0;
-+
- 		lirc_buffer_write_1 (context ->plugin ->rbuf, buf);
- 		wake_up (&context ->plugin ->rbuf ->wait_poll);
- 		return;
-diff -uBbwr lirc-0.8.0/remotes/imon/lircd.conf.imon-pad lirc-0.8.0-imon-pad2keys/remotes/imon/lircd.conf.imon-pad
---- lirc-0.8.0/remotes/imon/lircd.conf.imon-pad	2005-04-15 02:50:16.000000000 +0200
-+++ lirc-0.8.0-imon-pad2keys/remotes/imon/lircd.conf.imon-pad	2006-03-31 19:04:09.000000000 +0200
-@@ -2,11 +2,11 @@
- # by sending it to <lirc@bartelmus.de>

- #

- # this config file was automatically generated

--# using lirc-0.7.1pre2(imon) on Tue Mar  1 23:15:44 2005

-+# using lirc-0.8.0(imon_pad) on Mon Jan 23 20:22:11 2006
- #

--# contributed by Venky Raju

-+# contributed by M.Brakemeier
- #

--# brand:                       iMON-New

-+# brand:                       SoundGraph
- # model no. of remote control: iMON-PAD

- # devices being controlled by this remote:

- #

-@@ -24,12 +24,12 @@
-   min_repeat      1

-   toggle_bit      0

- 

--

-       begin codes

-           AppExit                  0x288195B7

-+        Power                    0x289115B7
-           Record                   0x298115B7

-           Play                     0x2A8115B7

--          SlowMotion               0x29B195B7

-+        Open                     0x29B1D5B7
-           Rewind                   0x2A8195B7

-           Pause                    0x2A9115B7

-           FastForward              0x2B8115B7

-@@ -59,15 +59,15 @@
-           0                        0x2BA595B7

-           ShiftTab                 0x28B515B7

-           Tab                      0x29A115B7

--          MyMovie                  0x2B8515B7

--          MyMusic                  0x299195B7

--          MyPhoto                  0x2BA115B7

--          MyTV                     0x28A515B7

-+        Red                      0x2B8515B7 # MyMovie
-+        Green                    0x299195B7 # MyMusic
-+        Blue                     0x2BA115B7 # MyPhoto
-+        Yellow                   0x28A515B7 # MyTV
-           Bookmark                 0x288515B7

-           Thumbnail                0x2AB715B7

-           AspectRatio              0x29A595B7

-           FullScreen               0x2AA395B7

--          MyDVD                    0x29A295B7

-+        Purple                   0x29A295B7 # MyDVD
-           Menu                     0x2BA385B7

-           Caption                  0x298595B7

-           Language                 0x2B8595B7

-@@ -79,6 +79,10 @@
-           MouseLeftClick           0x688301B7

-           WindowsKey               0x2B8195B7

-           Backspace                0x28A115B7

-+        Mouse_N                  0x690281B7
-+        Mouse_S                  0x688291B7
-+        Mouse_W                  0x6A8281B7
-+        Mouse_E                  0x688A81B7
-       end codes

- 

- end remote 

diff --git a/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.16.diff b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.16.diff
deleted file mode 100644
index 96d9a49c5c25..000000000000
--- a/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.16.diff
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -Naur lirc-0.8.0/drivers/kcompat.h lirc-0.8.0p1/drivers/kcompat.h
---- lirc-0.8.0/drivers/kcompat.h	2006-01-07 14:51:31.000000000 -0600
-+++ lirc-0.8.0p1/drivers/kcompat.h	2006-04-05 17:07:44.000000000 -0500
-@@ -5,6 +5,12 @@
- 
- #include <linux/version.h>
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-+#define LIRC_THIS_MODULE(x) x,
-+#else /* >= 2.6.16 */
-+#define LIRC_THIS_MODULE(x)
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- 
- #include <linux/device.h>
-@@ -245,6 +251,11 @@
- #   define I2C_ALGO_BIT 0
- #endif
- 
-+/* removed in 2.6.16 */
-+#ifndef I2C_DRIVERID_EXP3
-+#  define I2C_DRIVERID_EXP3 0xf003
-+#endif
-+
- /*************************** USB specific *****************************/
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
- #include <linux/usb.h>
-diff -Naur lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c lirc-0.8.0p1/drivers/lirc_atiusb/lirc_atiusb.c
---- lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c	2005-10-29 09:18:53.000000000 -0500
-+++ lirc-0.8.0p1/drivers/lirc_atiusb/lirc_atiusb.c	2006-04-05 17:12:34.000000000 -0500
-@@ -1180,7 +1180,7 @@
- }
- 
- static struct usb_driver usb_remote_driver = {
--	.owner =	THIS_MODULE,
-+	LIRC_THIS_MODULE(.owner = THIS_MODULE)
- 	.name =		DRIVER_NAME,
- 	.probe =	usb_remote_probe,
- 	.disconnect =	usb_remote_disconnect,
-diff -Naur lirc-0.8.0/drivers/lirc_i2c/lirc_i2c.c lirc-0.8.0p1/drivers/lirc_i2c/lirc_i2c.c
---- lirc-0.8.0/drivers/lirc_i2c/lirc_i2c.c	2005-10-20 13:25:58.000000000 -0500
-+++ lirc-0.8.0p1/drivers/lirc_i2c/lirc_i2c.c	2006-04-05 17:07:44.000000000 -0500
-@@ -360,9 +360,16 @@
- static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
- 
- static struct i2c_driver driver = {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)
-         name:           "i2c ir driver",
--        id:             I2C_DRIVERID_EXP3, /* FIXME */
-         flags:          I2C_DF_NOTIFY,
-+#else
-+	.driver = {
-+		owner:  THIS_MODULE,
-+		name:   "i2c ir driver",
-+	},
-+#endif
-+        id:             I2C_DRIVERID_EXP3, /* FIXME */
-         attach_adapter: ir_probe,
-         detach_client:  ir_detach,
-         command:        ir_command,
-diff -Naur lirc-0.8.0/drivers/lirc_igorplugusb/lirc_igorplugusb.c lirc-0.8.0p1/drivers/lirc_igorplugusb/lirc_igorplugusb.c
---- lirc-0.8.0/drivers/lirc_igorplugusb/lirc_igorplugusb.c	2005-03-21 08:39:38.000000000 -0600
-+++ lirc-0.8.0p1/drivers/lirc_igorplugusb/lirc_igorplugusb.c	2006-04-05 17:13:00.000000000 -0500
-@@ -615,7 +615,7 @@
- };
- 
- static struct usb_driver usb_remote_driver = {
--	.owner =	THIS_MODULE,
-+	LIRC_THIS_MODULE(.owner = THIS_MODULE)
- 	.name =		DRIVER_NAME,
- 	.probe =	usb_remote_probe,
- 	.disconnect =	usb_remote_disconnect,
-diff -Naur lirc-0.8.0/drivers/lirc_imon/lirc_imon.c lirc-0.8.0p1/drivers/lirc_imon/lirc_imon.c
---- lirc-0.8.0/drivers/lirc_imon/lirc_imon.c	2005-12-03 09:18:07.000000000 -0600
-+++ lirc-0.8.0p1/drivers/lirc_imon/lirc_imon.c	2006-04-05 22:47:28.000000000 -0500
-@@ -201,7 +201,7 @@
- 
- /* USB Device data */
- static struct usb_driver imon_driver = {
--	.owner 		= THIS_MODULE,
-+	LIRC_THIS_MODULE(.owner = THIS_MODULE)
- 	.name 		= MOD_NAME,
- 	.probe 		= imon_probe,
- 	.disconnect 	= imon_disconnect,
-diff -Naur lirc-0.8.0/drivers/lirc_mceusb/lirc_mceusb.c lirc-0.8.0p1/drivers/lirc_mceusb/lirc_mceusb.c
---- lirc-0.8.0/drivers/lirc_mceusb/lirc_mceusb.c	2005-10-29 09:18:53.000000000 -0500
-+++ lirc-0.8.0p1/drivers/lirc_mceusb/lirc_mceusb.c	2006-04-05 17:13:47.000000000 -0500
-@@ -222,7 +222,7 @@
- 
- /* usb specific object needed to register this driver with the usb subsystem */
- static struct usb_driver mceusb_driver = {
--	.owner =	THIS_MODULE,
-+	LIRC_THIS_MODULE(.owner = THIS_MODULE)
- 	.name =		DRIVER_NAME,
- 	.probe =	mceusb_probe,
- 	.disconnect =	mceusb_disconnect,
-diff -Naur lirc-0.8.0/drivers/lirc_mceusb2/lirc_mceusb2.c lirc-0.8.0p1/drivers/lirc_mceusb2/lirc_mceusb2.c
---- lirc-0.8.0/drivers/lirc_mceusb2/lirc_mceusb2.c	2005-10-29 09:18:53.000000000 -0500
-+++ lirc-0.8.0p1/drivers/lirc_mceusb2/lirc_mceusb2.c	2006-04-05 17:14:49.000000000 -0500
-@@ -585,7 +585,7 @@
- }
- 
- static struct usb_driver usb_remote_driver = {
--	.owner =	THIS_MODULE,
-+	LIRC_THIS_MODULE(.owner = THIS_MODULE)
- 	.name =		DRIVER_NAME,
- 	.probe =	usb_remote_probe,
- 	.disconnect =	usb_remote_disconnect,
-diff -Naur lirc-0.8.0/drivers/lirc_sasem/lirc_sasem.c lirc-0.8.0p1/drivers/lirc_sasem/lirc_sasem.c
---- lirc-0.8.0/drivers/lirc_sasem/lirc_sasem.c	2005-12-03 09:18:07.000000000 -0600
-+++ lirc-0.8.0p1/drivers/lirc_sasem/lirc_sasem.c	2006-04-05 17:16:34.000000000 -0500
-@@ -189,7 +189,7 @@
- 
- /* USB Device data */
- static struct usb_driver sasem_driver = {
--	.owner 		= THIS_MODULE,
-+	LIRC_THIS_MODULE(.owner = THIS_MODULE)
- 	.name 		= MOD_NAME,
- 	.probe 		= sasem_probe,
- 	.disconnect 	= sasem_disconnect,
-diff -Naur lirc-0.8.0/drivers/lirc_streamzap/lirc_streamzap.c lirc-0.8.0p1/drivers/lirc_streamzap/lirc_streamzap.c
---- lirc-0.8.0/drivers/lirc_streamzap/lirc_streamzap.c	2006-01-06 01:18:03.000000000 -0600
-+++ lirc-0.8.0p1/drivers/lirc_streamzap/lirc_streamzap.c	2006-04-05 17:17:39.000000000 -0500
-@@ -177,7 +177,7 @@
- /* usb specific object needed to register this driver with the usb subsystem */
- 
- static struct usb_driver streamzap_driver = {
--	.owner =	THIS_MODULE,
-+	LIRC_THIS_MODULE(.owner = THIS_MODULE)
- 	.name =		DRIVER_NAME,
- 	.probe =	streamzap_probe,
- 	.disconnect =	streamzap_disconnect,
diff --git a/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.17.diff b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.17.diff
deleted file mode 100644
index adc0c66d6448..000000000000
--- a/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.17.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru lirc-0.8.0/drivers/lirc_gpio/lirc_gpio.c lirc-0.8.0-kernel-2.6.17/drivers/lirc_gpio/lirc_gpio.c
---- lirc-0.8.0/drivers/lirc_gpio/lirc_gpio.c	2006-01-01 14:43:46.000000000 +0100
-+++ lirc-0.8.0-kernel-2.6.17/drivers/lirc_gpio/lirc_gpio.c	2006-06-21 17:20:32.000000000 +0200
-@@ -48,9 +48,12 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
- #include "../drivers/char/bttv.h"
- #include "../drivers/char/bttvp.h"
--#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
- #include "../drivers/media/video/bttv.h"
- #include "../drivers/media/video/bttvp.h"
-+#else
-+#include "../drivers/media/video/bt8xx/bttv.h"
-+#include "../drivers/media/video/bt8xx/bttvp.h"
- #endif
- 
- #if BTTV_VERSION_CODE < KERNEL_VERSION(0,7,45)
-diff -ru lirc-0.8.0/drivers/Makefile.common lirc-0.8.0-kernel-2.6.17/drivers/Makefile.common
---- lirc-0.8.0/drivers/Makefile.common	2005-12-27 13:59:01.000000000 +0100
-+++ lirc-0.8.0-kernel-2.6.17/drivers/Makefile.common	2006-06-21 17:47:14.000000000 +0200
-@@ -10,7 +10,8 @@
- KBUILD_VERBOSE = 1
- LIRC_EXTRA_CFLAGS = -DIRCTL_DEV_MAJOR=$(lirc_major) -DEXPORT_SYMTAB $(DEFS) \
- 		$(DEFAULT_INCLUDES) -I$(LIRC_DEVDIR)/../.. \
--		-I$(KERNEL_LOCATION)/include/
-+		-I$(KERNEL_LOCATION)/include/ \
-+		-I$(KERNEL_LOCATION)/drivers/media/video/
- export LIRC_EXTRA_CFLAGS KERNEL_LOCATION module_DATA
- 
- $(module_DATA): $(automake_dummy_SOURCES) $(top_srcdir)/config.h ../lirc.h
diff --git a/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.18.diff b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.18.diff
deleted file mode 100644
index 3902658f246b..000000000000
--- a/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.18.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -ru lirc-0.8.0-orig/drivers/kcompat.h lirc-0.8.0/drivers/kcompat.h
---- lirc-0.8.0-orig/drivers/kcompat.h	2006-07-16 21:09:26.323828798 +0200
-+++ lirc-0.8.0/drivers/kcompat.h	2006-07-16 21:09:45.441698751 +0200
-@@ -15,8 +15,11 @@
- 
- #include <linux/device.h>
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
- #define LIRC_HAVE_DEVFS
- #define LIRC_HAVE_DEVFS_26
-+#endif
-+
- #define LIRC_HAVE_SYSFS
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-diff -ru lirc-0.8.0-orig/drivers/lirc_dev/lirc_dev.c lirc-0.8.0/drivers/lirc_dev/lirc_dev.c
---- lirc-0.8.0-orig/drivers/lirc_dev/lirc_dev.c	2006-07-16 21:09:26.327829190 +0200
-+++ lirc-0.8.0/drivers/lirc_dev/lirc_dev.c	2006-07-16 21:09:45.441698751 +0200
-@@ -49,16 +49,18 @@
- #endif
- #define __KERNEL_SYSCALLS__
- #include <linux/unistd.h>
-+
-+#include "drivers/kcompat.h"
-+
- /* DevFS header */
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-+#if defined(LIRC_HAVE_DEVFS)
- #include <linux/devfs_fs_kernel.h>
- #endif
- /* SysFS header */
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if defined(LIRC_HAVE_SYSFS)
- #include <linux/device.h>
- #endif
- 
--#include "drivers/kcompat.h"
- #include "drivers/lirc.h"
- #include "lirc_dev.h"
- 
-diff -ru lirc-0.8.0-orig/drivers/lirc_imon/lirc_imon.c lirc-0.8.0/drivers/lirc_imon/lirc_imon.c
---- lirc-0.8.0-orig/drivers/lirc_imon/lirc_imon.c	2006-07-16 21:09:26.327829190 +0200
-+++ lirc-0.8.0/drivers/lirc_imon/lirc_imon.c	2006-07-16 21:11:14.542390676 +0200
-@@ -58,10 +58,13 @@
- #include <linux/slab.h>
- #include <asm/uaccess.h>
- #include <linux/usb.h>
-+#include "drivers/kcompat.h"
-+
-+#if defined(LIRC_HAVE_DEVFS)
- #include <linux/devfs_fs_kernel.h>
-+#endif
- 
- #include "drivers/lirc.h"
--#include "drivers/kcompat.h"
- #include "drivers/lirc_dev/lirc_dev.h"
- 
- 
-diff -ru lirc-0.8.0-orig/drivers/lirc_sasem/lirc_sasem.c lirc-0.8.0/drivers/lirc_sasem/lirc_sasem.c
---- lirc-0.8.0-orig/drivers/lirc_sasem/lirc_sasem.c	2006-07-16 21:09:26.323828798 +0200
-+++ lirc-0.8.0/drivers/lirc_sasem/lirc_sasem.c	2006-07-16 21:12:21.700919590 +0200
-@@ -67,10 +67,13 @@
- #include <linux/slab.h>
- #include <asm/uaccess.h>
- #include <linux/usb.h>
-+
-+#include "drivers/kcompat.h"
-+#if defined(LIRC_HAVE_DEVFS)
- #include <linux/devfs_fs_kernel.h>
-+#endif
- 
- #include "drivers/lirc.h"
--#include "drivers/kcompat.h"
- #include "drivers/lirc_dev/lirc_dev.h"
- 
- 
diff --git a/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.19.diff b/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.19.diff
deleted file mode 100644
index 1bd3bba112b1..000000000000
--- a/app-misc/lirc/files/lirc-0.8.0-kernel-2.6.19.diff
+++ /dev/null
@@ -1,177 +0,0 @@
-diff -ru lirc-0.8.0-orig/drivers/lirc_atiusb/lirc_atiusb.c lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c
---- lirc-0.8.0-orig/drivers/lirc_atiusb/lirc_atiusb.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c	2006-11-30 17:36:09.521865003 +0100
-@@ -39,7 +39,7 @@
- #error "*******************************************************"
- #endif
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- 
- #include <linux/kernel.h>
- #include <linux/errno.h>
-diff -ru lirc-0.8.0-orig/drivers/lirc_bt829/lirc_bt829.c lirc-0.8.0/drivers/lirc_bt829/lirc_bt829.c
---- lirc-0.8.0-orig/drivers/lirc_bt829/lirc_bt829.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_bt829/lirc_bt829.c	2006-11-30 17:36:09.513863048 +0100
-@@ -23,7 +23,7 @@
- #error "This driver needs kernel version 2.4.0 or higher"
- #endif
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/threads.h>
-diff -ru lirc-0.8.0-orig/drivers/lirc_cmdir/lirc_cmdir.c lirc-0.8.0/drivers/lirc_cmdir/lirc_cmdir.c
---- lirc-0.8.0-orig/drivers/lirc_cmdir/lirc_cmdir.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_cmdir/lirc_cmdir.c	2006-11-30 17:36:09.513863048 +0100
-@@ -35,7 +35,7 @@
- #error "**********************************************************"
- #endif
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/module.h>
- #include <linux/errno.h>
- #include <linux/signal.h>
-diff -ru lirc-0.8.0-orig/drivers/lirc_dev/lirc_dev.c lirc-0.8.0/drivers/lirc_dev/lirc_dev.c
---- lirc-0.8.0-orig/drivers/lirc_dev/lirc_dev.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_dev/lirc_dev.c	2006-11-30 17:36:09.509862074 +0100
-@@ -32,7 +32,7 @@
- #error "**********************************************************"
- #endif
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/sched.h>
-diff -ru lirc-0.8.0-orig/drivers/lirc_igorplugusb/lirc_igorplugusb.c lirc-0.8.0/drivers/lirc_igorplugusb/lirc_igorplugusb.c
---- lirc-0.8.0-orig/drivers/lirc_igorplugusb/lirc_igorplugusb.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_igorplugusb/lirc_igorplugusb.c	2006-11-30 17:36:09.497859140 +0100
-@@ -47,7 +47,7 @@
- #error "*******************************************************"
- #endif
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/kmod.h>
-diff -ru lirc-0.8.0-orig/drivers/lirc_imon/lirc_imon.c lirc-0.8.0/drivers/lirc_imon/lirc_imon.c
---- lirc-0.8.0-orig/drivers/lirc_imon/lirc_imon.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_imon/lirc_imon.c	2006-11-30 17:36:09.493858163 +0100
-@@ -49,7 +49,7 @@
- #error "*** Sorry, this driver requires kernel version 2.4.22 or higher"
- #endif
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- 
- #include <linux/errno.h>
- #include <linux/init.h>
-diff -ru lirc-0.8.0-orig/drivers/lirc_it87/lirc_it87.c lirc-0.8.0/drivers/lirc_it87/lirc_it87.c
---- lirc-0.8.0-orig/drivers/lirc_it87/lirc_it87.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_it87/lirc_it87.c	2006-11-30 17:36:09.489857186 +0100
-@@ -38,7 +38,7 @@
- # include <config.h>
- #endif
-  
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- 
- 
- #include <linux/sched.h>
-diff -ru lirc-0.8.0-orig/drivers/lirc_mceusb/lirc_mceusb.c lirc-0.8.0/drivers/lirc_mceusb/lirc_mceusb.c
---- lirc-0.8.0-orig/drivers/lirc_mceusb/lirc_mceusb.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_mceusb/lirc_mceusb.c	2006-11-30 17:36:09.485856208 +0100
-@@ -88,7 +88,7 @@
-  *
-  */
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/kernel.h>
- #include <linux/errno.h>
- #include <linux/init.h>
-diff -ru lirc-0.8.0-orig/drivers/lirc_mceusb2/lirc_mceusb2.c lirc-0.8.0/drivers/lirc_mceusb2/lirc_mceusb2.c
---- lirc-0.8.0-orig/drivers/lirc_mceusb2/lirc_mceusb2.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_mceusb2/lirc_mceusb2.c	2006-11-30 17:36:09.481855231 +0100
-@@ -37,7 +37,7 @@
- #error "*******************************************************"
- #endif
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- 
- #include <linux/kernel.h>
- #include <linux/errno.h>
-diff -ru lirc-0.8.0-orig/drivers/lirc_parallel/lirc_parallel.c lirc-0.8.0/drivers/lirc_parallel/lirc_parallel.c
---- lirc-0.8.0-orig/drivers/lirc_parallel/lirc_parallel.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_parallel/lirc_parallel.c	2006-11-30 17:36:09.477854256 +0100
-@@ -40,7 +40,7 @@
- #error "**********************************************************"
- #endif
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- 
- #ifdef CONFIG_SMP
- #error "--- Sorry, this driver is not SMP safe. ---"
-@@ -50,7 +50,7 @@
- #include <linux/sched.h>
- #include <linux/errno.h>
- #include <linux/signal.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/fs.h>
- #include <linux/kernel.h>
- #include <linux/ioport.h>
-diff -ru lirc-0.8.0-orig/drivers/lirc_sasem/lirc_sasem.c lirc-0.8.0/drivers/lirc_sasem/lirc_sasem.c
---- lirc-0.8.0-orig/drivers/lirc_sasem/lirc_sasem.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_sasem/lirc_sasem.c	2006-11-30 17:36:09.473853278 +0100
-@@ -58,7 +58,7 @@
- #error "*** Sorry, this driver requires kernel version 2.4.22 or higher"
- #endif
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- 
- #include <linux/errno.h>
- #include <linux/init.h>
-diff -ru lirc-0.8.0-orig/drivers/lirc_serial/lirc_serial.c lirc-0.8.0/drivers/lirc_serial/lirc_serial.c
---- lirc-0.8.0-orig/drivers/lirc_serial/lirc_serial.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_serial/lirc_serial.c	2006-11-30 17:36:09.469852301 +0100
-@@ -61,7 +61,7 @@
- #error "**********************************************************"
- #endif
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- 
- #if defined(CONFIG_SERIAL) || defined(CONFIG_SERIAL_8250)
- #warning "******************************************"
-diff -ru lirc-0.8.0-orig/drivers/lirc_sir/lirc_sir.c lirc-0.8.0/drivers/lirc_sir/lirc_sir.c
---- lirc-0.8.0-orig/drivers/lirc_sir/lirc_sir.c	2006-11-30 17:34:50.834649582 +0100
-+++ lirc-0.8.0/drivers/lirc_sir/lirc_sir.c	2006-11-30 17:36:09.465851323 +0100
-@@ -46,7 +46,7 @@
- # include <config.h>
- #endif
-  
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- 
- #if !defined(LIRC_ON_SA1100) && !defined(CONFIG_SERIAL_MODULE)
- #warning "******************************************"
-diff -ru lirc-0.8.0-orig/drivers/lirc_streamzap/lirc_streamzap.c lirc-0.8.0/drivers/lirc_streamzap/lirc_streamzap.c
---- lirc-0.8.0-orig/drivers/lirc_streamzap/lirc_streamzap.c	2006-11-30 17:34:50.830648604 +0100
-+++ lirc-0.8.0/drivers/lirc_streamzap/lirc_streamzap.c	2006-11-30 17:36:09.457849368 +0100
-@@ -38,7 +38,7 @@
- #error "*******************************************************"
- #endif
- 
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/kernel.h>
- #include <linux/errno.h>
- #include <linux/init.h>
diff --git a/app-misc/lirc/files/lirc-0.8.0-sandbox-fix.diff b/app-misc/lirc/files/lirc-0.8.0-sandbox-fix.diff
deleted file mode 100644
index b4b0600bb50b..000000000000
--- a/app-misc/lirc/files/lirc-0.8.0-sandbox-fix.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-lirc: Fix build in sandbox
-
-From: Daniel Drake <dsd@gentoo.org>
-
-
-Index: lirc-0.8.0/acinclude.m4
-===================================================================
---- lirc-0.8.0.orig/acinclude.m4
-+++ lirc-0.8.0/acinclude.m4
-@@ -36,14 +36,14 @@ AC_DEFUN([AC_PATH_KERNEL_SOURCE_SEARCH],
-       echo "lirc_tell_me_what_cc_is:" >>${ac_pkss_makefile}
-       echo "	echo \$(CC)" >>${ac_pkss_makefile}
- 
--      kernelcc=`make -s -C ${kerneldir} -f ${ac_pkss_makefile} lirc_tell_me_what_cc_is`
-+      kernelcc=$(make -s -C ${kerneldir} -f ${ac_pkss_makefile} lirc_tell_me_what_cc_is M=$(pwd))
- 
-       echo "lirc_tell_me_what_version_is:" >>${ac_pkss_makefile}
-       echo "	echo \$(VERSION)" >>${ac_pkss_makefile}
-       echo "lirc_tell_me_what_patchlevel_is:" >>${ac_pkss_makefile}
-       echo "	echo \$(PATCHLEVEL)" >>${ac_pkss_makefile}
--      version=`make -s -C ${kerneldir} -f ${ac_pkss_makefile} lirc_tell_me_what_version_is`
--      patchlevel=`make -s -C ${kerneldir} -f ${ac_pkss_makefile} lirc_tell_me_what_patchlevel_is`
-+      version=$(make -s -C ${kerneldir} -f ${ac_pkss_makefile} lirc_tell_me_what_version_is M=$(pwd))
-+      patchlevel=$(make -s -C ${kerneldir} -f ${ac_pkss_makefile} lirc_tell_me_what_patchlevel_is M=$(pwd))
-       if test ${version} -eq 2; then
-         if test ${patchlevel} -lt 5; then
-           kernelext=o
diff --git a/app-misc/lirc/files/lirc-0.8.0-too-many-connections-overflow.diff b/app-misc/lirc/files/lirc-0.8.0-too-many-connections-overflow.diff
deleted file mode 100644
index 67957c5edb31..000000000000
--- a/app-misc/lirc/files/lirc-0.8.0-too-many-connections-overflow.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- lirc-0.8.0/daemons/lircd.c	2006/01/22 12:34:38	5.62
-+++ lirc-0.8.0/daemons/lircd.c	2006/02/28 21:24:18	5.63
-@@ -143,16 +143,18 @@
- FILE *lf=NULL;
- #endif
- 
--/* fixme: */
-+/* quite arbitrary limits */
- #define MAX_PEERS	100
-+/* substract one for lirc, sockfd, sockinet, logfile, pidfile */
-+#define MAX_CLIENTS     (FD_SETSIZE-5-MAX_PEERS)
- 
- int sockfd, sockinet;
--int clis[FD_SETSIZE-5-MAX_PEERS]; /* substract one for lirc, sockfd, sockinet, logfile, pidfile */
-+int clis[MAX_CLIENTS];
- 
- #define CT_LOCAL  1
- #define CT_REMOTE 2
- 
--int cli_type[FD_SETSIZE-5-MAX_PEERS];
-+int cli_type[MAX_CLIENTS];
- int clin=0;
- 
- int listen_tcpip=0;
-@@ -471,7 +473,7 @@
- 		dosigterm(SIGTERM);
- 	};
- 
--	if(fd>=FD_SETSIZE)
-+	if(fd>=FD_SETSIZE || clin>=MAX_CLIENTS)
- 	{
- 		logprintf(LOG_ERR,"connection rejected");
- 		shutdown(fd,2);
diff --git a/app-misc/lirc/files/lirc-0.8.0pre4-xbox-remote.diff b/app-misc/lirc/files/lirc-0.8.0pre4-xbox-remote.diff
deleted file mode 100644
index dd1dddc1eebb..000000000000
--- a/app-misc/lirc/files/lirc-0.8.0pre4-xbox-remote.diff
+++ /dev/null
@@ -1,292 +0,0 @@
-Downloaded from http://wojci.dk/lirc-xbox/
-
-diff -d -r -u lirc-0.8.0pre4-orig/drivers/Makefile.kernel lirc-0.8.0pre4/drivers/Makefile.kernel
---- lirc-0.8.0pre4-orig/drivers/Makefile.kernel	2004-01-19 21:04:09.000000000 +0100
-+++ lirc-0.8.0pre4/drivers/Makefile.kernel	2006-01-22 14:44:25.000000000 +0100
-@@ -1,5 +1,5 @@
- 
--EXTRA_CFLAGS += $(LIRC_EXTRA_CFLAGS)
-+EXTRA_CFLAGS += $(LIRC_EXTRA_CFLAGS) -DXBOX_SUPPORT=1
- 
- obj-m=$(module_DATA)
- MI_OBJS      = $(module_DATA)
-diff -d -r -u lirc-0.8.0pre4-orig/drivers/lirc_atiusb/lirc_atiusb.c lirc-0.8.0pre4/drivers/lirc_atiusb/lirc_atiusb.c
---- lirc-0.8.0pre4-orig/drivers/lirc_atiusb/lirc_atiusb.c	2005-10-29 16:18:53.000000000 +0200
-+++ lirc-0.8.0pre4/drivers/lirc_atiusb/lirc_atiusb.c	2006-01-22 14:22:47.000000000 +0100
-@@ -62,11 +62,22 @@
- #define DRIVER_VERSION		"0.5"
- #define DRIVER_AUTHOR		"Paul Miller <pmiller9@users.sourceforge.net>"
- #define DRIVER_DESC		"USB remote driver for LIRC"
--#define DRIVER_NAME		"lirc_atiusb"
- 
--#define CODE_LENGTH		5
--#define CODE_LENGTH_ATI2	3
--#define CODE_MIN_LENGTH		3
-+#ifdef XBOX_SUPPORT
-+#  define DRIVER_NAME		"lirc_atiusb (xbox version)"
-+#else
-+#  define DRIVER_NAME		"lirc_atiusb"
-+#endif // XBOX_SUPPORT
-+
-+#ifdef XBOX_SUPPORT
-+#	define CODE_LENGTH		1 // length of code sent to lirc
-+#	define CODE_MIN_LENGTH		1
-+#	define USB_BUFLEN		6 // code received from xbox ir
-+#else
-+#	define CODE_LENGTH		5
-+#	define CODE_LENGTH_ATI2	3
-+#	define CODE_MIN_LENGTH		3
-+#endif // XBOX_SUPPORT
- 
- #define RW2_MODENAV_KEYCODE	0x3F
- #define RW2_NULL_MODE		0xFF
-@@ -79,11 +90,16 @@
- #define RW2_RELEASE_CODE	0
- 
- /* module parameters */
-+//#ifndef XBOX_SUPPORT
- #ifdef CONFIG_USB_DEBUG
- 	static int debug = 1;
- #else
- 	static int debug = 0;
- #endif
-+//#else
-+//	static int debug = 1;
-+//#endif // !XBOX_SUPPORT
-+
- #define dprintk(fmt, args...)                                 \
- 	do{                                                   \
- 		if(debug) printk(KERN_DEBUG fmt, ## args);    \
-@@ -120,8 +136,14 @@
- 
- #define VENDOR_ATI1		0x0bc7
- #define VENDOR_ATI2		0x0471
-+#define VENDOR_MS1		0x040b
-+#define VENDOR_MS2		0x045e
- 
- static struct usb_device_id usb_remote_table [] = {
-+#ifdef XBOX_SUPPORT
-+	{ USB_DEVICE(VENDOR_MS1, 0x6521) }, /* Gamester Xbox DVD Movie Playback Kit IR */
-+	{ USB_DEVICE(VENDOR_MS2, 0x0284) }, /* Microsoft Xbox DVD Movie Playback Kit IR */
-+#else
- 	{ USB_DEVICE(VENDOR_ATI1, 0x0002) },	/* X10 USB Firecracker Interface */
- 	{ USB_DEVICE(VENDOR_ATI1, 0x0003) },	/* X10 VGA Video Sender */
- 	{ USB_DEVICE(VENDOR_ATI1, 0x0004) },	/* ATI Wireless Remote Receiver */
-@@ -139,6 +161,7 @@
- 
- 	{ USB_DEVICE(VENDOR_ATI2, 0x0602) },	/* ATI Remote Wonder 2: Input Device */
- 	{ USB_DEVICE(VENDOR_ATI2, 0x0603) },	/* ATI Remote Wonder 2: Controller (???) */
-+#endif // XBOX_SUPPORT
- 
- 	{ }					/* Terminating entry */
- };
-@@ -168,7 +191,13 @@
- #endif
- 
- 	/* handle repeats */
-+#if XBOX_SUPPORT
-+	// Store the whole input and use 
-+	// to compare when receiving new data.
-+	unsigned char old[USB_BUFLEN];
-+#else
- 	unsigned char old[CODE_LENGTH];
-+#endif // XBOX_SUPPORT
- 	unsigned long old_jiffies;
- };
- 
-@@ -367,6 +396,26 @@
- 	MOD_DEC_USE_COUNT;
- }
- 
-+#ifdef XBOX_SUPPORT
-+static void print_xbox_data(char* buf, int len)
-+{
-+	unsigned char *idata=buf;
-+	if (len >= USB_BUFLEN)
-+	{
-+		dprintk(DRIVER_NAME ": received bytes %02x %02x %02x %02x %02x %02x\n",
-+                idata[0],
-+                idata[1],
-+                idata[2],
-+                idata[3],
-+                idata[4],
-+                idata[5]);
-+	}
-+	else
-+	{
-+		dprintk(DRIVER_NAME ": unrecognized, length=%d\n", len);
-+	}
-+}
-+#else
- static void print_data(struct in_endpt *iep, char *buf, int len)
- {
- 	char codes[CODE_LENGTH*3 + 1];
-@@ -381,7 +430,42 @@
- 	printk(DRIVER_NAME "[%d]: data received %s (ep=0x%x length=%d)\n",
- 		iep->ir->devnum, codes, iep->ep->bEndpointAddress, len);
- }
-+#endif // XBOX_SUPPORT
-+
-+#ifdef XBOX_SUPPORT
-+static int code_check_xbox(struct in_endpt *iep, int len)
-+{
-+	int i;
-+
-+	if (len != USB_BUFLEN)
-+	{
-+		dprintk(DRIVER_NAME ": We didn't get 6 bytes from xbox ir.. ?\n");
-+		return -1;
-+	}
-+
-+	// Using USB_BUFLEN, as the original input is compared.
-+
-+       	/* check for repeats */
-+	if (memcmp(iep->old, iep->buf, len) == 0) 
-+	{
-+		if (iep->old_jiffies + repeat_jiffies > jiffies) 
-+		{
-+			return -1;
-+		}
-+	} 
-+	else 
-+	{
-+		for (i = len; i < USB_BUFLEN; i++) 
-+		{
-+			iep->buf[i] = 0;
-+		}
-+		memcpy(iep->old, iep->buf, USB_BUFLEN);
-+        }
-+	iep->old_jiffies = jiffies;
- 
-+	return SUCCESS;
-+}
-+#else
- static int code_check_ati1(struct in_endpt *iep, int len)
- {
- 	struct irctl *ir = iep->ir;
-@@ -598,6 +682,7 @@
- 	return SUCCESS;
- }
- 
-+#endif // !XBOX_SUPPORT
- 
- #ifdef KERNEL_2_5
- static void usb_remote_recv(struct urb *urb, struct pt_regs *regs)
-@@ -607,6 +692,9 @@
- {
- 	struct in_endpt *iep;
- 	int len, result;
-+#if XBOX_SUPPORT
-+	char buf[CODE_LENGTH];
-+#endif // XBOX_SUPPORT
- 
- 	if (!urb)
- 		return;
-@@ -622,13 +710,37 @@
- 
- 	len = urb->actual_length;
- 	if (debug)
-+#ifdef XBOX_SUPPORT
-+		print_xbox_data(urb->transfer_buffer, len);
-+#else
- 		print_data(iep,urb->transfer_buffer,len);
-+#endif // XBOX_SUPPORT
- 
- 	switch (urb->status) {
- 
- 	/* success */
- 	case SUCCESS:
-+#ifdef XBOX_SUPPORT
-+		{
-+			if (len != USB_BUFLEN)
-+			{
-+				dprintk(DRIVER_NAME ": We didn't get 6 bytes from xbox ir.. ?\n");
-+				return;
-+			}
-+
-+			if (code_check_xbox(iep, len) == SUCCESS)
-+			{
-+				// the third byte of xbox ir packet seems to contain key info
-+        	        	// the last two bytes are.. some kind of clock?
-+	        	        buf[0]=((char*)urb->transfer_buffer)[2];
- 
-+				dprintk(DRIVER_NAME ": write to lirc buffer and wakeup\n");
-+				lirc_buffer_write_1(iep->ir->p->rbuf, buf);
-+				wake_up(&iep->ir->p->rbuf->wait_poll);
-+			}
-+		break;
-+		}
-+#else
- 		switch (iep->ir->remote_type) {
- 		case ATI2_COMPATIBLE:
- 			result = code_check_ati2(iep, len);
-@@ -641,7 +753,7 @@
- 		lirc_buffer_write_1(iep->ir->p->rbuf, iep->buf);
- 		wake_up(&iep->ir->p->rbuf->wait_poll);
- 		break;
--
-+#endif // XBOX_SUPPORT
- 	/* unlink */
- 	case -ECONNRESET:
- 	case -ENOENT:
-@@ -759,9 +871,18 @@
- 	pipe = usb_rcvintpipe(dev, addr);
- 	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
- 
-+#ifdef XBOX_SUPPORT
-+	dprintk("maxp = %d\n", maxp);
-+#endif // XBOX_SUPPORT 
-+
- //	len = (maxp > USB_BUFLEN) ? USB_BUFLEN : maxp;
- //	len -= (len % CODE_LENGTH);
-+
-+#if XBOX_SUPPORT
-+        len = USB_BUFLEN;
-+#else
- 	len = CODE_LENGTH;
-+#endif // XBOX_SUPPORT
- 
- 	dprintk(DRIVER_NAME "[%d]: acceptable inbound endpoint (0x%x) found (maxp=%d len=%d)\n", ir->devnum, addr, maxp, len);
- 
-@@ -940,12 +1061,19 @@
- 
- 	/* determine remote type */
- 	switch (dev->descriptor.idVendor) {
-+#ifdef XBOX_SUPPORT
-+	case VENDOR_MS1:
-+	case VENDOR_MS2:
-+		type = ATI1_COMPATIBLE;
-+		break;
-+#else
- 	case VENDOR_ATI1:
- 		type = ATI1_COMPATIBLE;
- 		break;
- 	case VENDOR_ATI2:
- 		type = ATI2_COMPATIBLE;
- 		break;
-+#endif // XBOX_SUPPORT
- 	default:
- 		dprintk(DRIVER_NAME "[%d]: unknown type\n", devnum);
- 		return NULL;
-@@ -1140,9 +1268,10 @@
- 
- 		/* Note new driver registration in kernel logs */
- 		log_usb_dev_info(dev);
--
-+//#ifndef XBOX_SUPPORT
- 		/* outbound data (initialization) */
- 		send_outbound_init(ir);
-+//#endif // !XBOX_SUPPORT
- 	}
- 
- #ifdef KERNEL_2_5
-@@ -1196,6 +1325,9 @@
- 	printk("\n" DRIVER_NAME ": " DRIVER_DESC " v" DRIVER_VERSION "\n");
- 	printk(DRIVER_NAME ": " DRIVER_AUTHOR "\n");
- 	dprintk(DRIVER_NAME ": debug mode enabled: $Id: lirc_atiusb.c,v 1.51 2005/10/29 14:18:53 lirc Exp $\n");
-+#ifdef XBOX_SUPPORT
-+	dprintk(DRIVER_NAME ": XBOX support enabled..\n");
-+#endif
- 
- 	request_module("lirc_dev");
- 
diff --git a/app-misc/lirc/files/lirc-0.8.1-atiusb-xbox.diff b/app-misc/lirc/files/lirc-0.8.1-atiusb-xbox.diff
deleted file mode 100644
index 515c26838d8b..000000000000
--- a/app-misc/lirc/files/lirc-0.8.1-atiusb-xbox.diff
+++ /dev/null
@@ -1,198 +0,0 @@
---- ../../lirc-modules.orig/lirc/drivers/lirc_atiusb/lirc_atiusb.c	2006-09-18 16:39:16.000000000 +0300
-+++ drivers/lirc_atiusb/lirc_atiusb.c	2006-12-16 20:46:04.000000000 +0200
-@@ -11,6 +11,10 @@
-  *      "USB StreamZap remote driver" (LIRC)
-  *   Artur Lipowski <alipowski@kki.net.pl>'s 2002
-  *      "lirc_dev" and "lirc_gpio" LIRC modules
-+ *   Michael Wojciechowski
-+ *      initial xbox support
-+ *   Vassilis Virvilis <vasvir@iit.demokritos.gr> 2006
-+ *      reworked the patch for lirc submission
-  *
-  * $Id: lirc-0.8.1-atiusb-xbox.diff,v 1.1 2007/01/03 18:17:15 zzam Exp $
-  */
-@@ -64,9 +68,9 @@
- #define DRIVER_DESC		"USB remote driver for LIRC"
- #define DRIVER_NAME		"lirc_atiusb"
- 
--#define CODE_LENGTH		5
--#define CODE_LENGTH_ATI2	3
--#define CODE_MIN_LENGTH		3
-+#define CODE_LENGTH		code_length[ir->remote_type]
-+#define CODE_MIN_LENGTH		code_min_length[ir->remote_type]
-+#define DECODE_LENGTH		decode_length[ir->remote_type]
- 
- #define RW2_MODENAV_KEYCODE	0x3F
- #define RW2_NULL_MODE		0xFF
-@@ -89,6 +93,14 @@
- 		if(debug) printk(KERN_DEBUG fmt, ## args);    \
- 	}while(0)
- 
-+// ATI, ATI2, XBOX
-+static const int code_length[] = {5, 3, 6};
-+static const int code_min_length[] = {3, 3, 6};
-+static const int decode_length[] = {5, 3, 1};
-+// USB_BUFF_LEN must be the maximum value of the code_length array.
-+// It is used for static arrays.
-+#define USB_BUFF_LEN 6
-+
- static int mask = 0xFFFF;	// channel acceptance bit mask
- static int unique = 0;		// enable channel-specific codes
- static int repeat = 10;		// repeat time in 1/100 sec
-@@ -120,6 +132,8 @@
- 
- #define VENDOR_ATI1		0x0bc7
- #define VENDOR_ATI2		0x0471
-+#define VENDOR_MS1		0x040b
-+#define VENDOR_MS2		0x045e
- 
- static struct usb_device_id usb_remote_table [] = {
- 	{ USB_DEVICE(VENDOR_ATI1, 0x0002) },	/* X10 USB Firecracker Interface */
-@@ -140,6 +154,8 @@
- 	{ USB_DEVICE(VENDOR_ATI2, 0x0602) },	/* ATI Remote Wonder 2: Input Device */
- 	{ USB_DEVICE(VENDOR_ATI2, 0x0603) },	/* ATI Remote Wonder 2: Controller (???) */
- 
-+	{ USB_DEVICE(VENDOR_MS1, 0x6521) }, /* Gamester Xbox DVD Movie Playback Kit IR */
-+	{ USB_DEVICE(VENDOR_MS2, 0x0284) }, /* Microsoft Xbox DVD Movie Playback Kit IR */
- 	{ }					/* Terminating entry */
- };
- 
-@@ -168,7 +184,7 @@
- #endif
- 
- 	/* handle repeats */
--	unsigned char old[CODE_LENGTH];
-+	unsigned char old[USB_BUFF_LEN];
- 	unsigned long old_jiffies;
- };
- 
-@@ -206,7 +222,8 @@
- 	/* remote type based on usb_device_id tables */
- 	enum {
- 		ATI1_COMPATIBLE,
--		ATI2_COMPATIBLE
-+		ATI2_COMPATIBLE,
-+		XBOX_COMPATIBLE
- 	} remote_type;
- 
- 	/* rw2 current mode (mirror's remote's state) */
-@@ -369,13 +386,14 @@
- 
- static void print_data(struct in_endpt *iep, char *buf, int len)
- {
--	char codes[CODE_LENGTH*3 + 1];
-+	const int clen = code_length[iep->ir->remote_type];
-+	char codes[clen * 3 + 1];
- 	int i;
- 
- 	if (len <= 0)
- 		return;
- 
--	for (i = 0; i < len && i < CODE_LENGTH; i++) {
-+	for (i = 0; i < len && i < clen; i++) {
- 		snprintf(codes+i*3, 4, "%02x ", buf[i] & 0xFF);
- 	}
- 	printk(DRIVER_NAME "[%d]: data received %s (ep=0x%x length=%d)\n",
-@@ -506,7 +524,7 @@
- 	int mode, i;
- 	char *buf = iep->buf;
- 
--	if (len != CODE_LENGTH_ATI2) {
-+	if (len != CODE_LENGTH) {
- 		dprintk(DRIVER_NAME
- 			"[%d]: Huh?  Abnormal length (%d) buffer recieved.\n",
- 			ir->devnum, len);
-@@ -598,6 +616,37 @@
- 	return SUCCESS;
- }
- 
-+static int code_check_xbox(struct in_endpt *iep, int len)
-+{
-+	struct irctl *ir = iep->ir;
-+	const int clen = CODE_LENGTH;
-+
-+	if (len != clen)
-+	{
-+		dprintk(DRIVER_NAME ": We got %d instead of %d bytes from xbox ir.. ?\n", len, clen);
-+		return -1;
-+	}
-+
-+	/* check for repeats */
-+	if (memcmp(iep->old, iep->buf, len) == 0) 
-+	{
-+		if (iep->old_jiffies + repeat_jiffies > jiffies) 
-+		{
-+			return -1;
-+		}
-+	} 
-+	else 
-+	{
-+		// the third byte of xbox ir packet seems to contain key info
-+		// the last two bytes are.. some kind of clock?
-+		iep->buf[0] = iep->buf[2];
-+		memset(iep->buf + 1, 0, len - 1);
-+		memcpy(iep->old, iep->buf, len);
-+	}
-+	iep->old_jiffies = jiffies;
-+
-+	return SUCCESS;
-+}
- 
- #ifdef KERNEL_2_5
- static void usb_remote_recv(struct urb *urb, struct pt_regs *regs)
-@@ -606,7 +655,7 @@
- #endif
- {
- 	struct in_endpt *iep;
--	int len, result;
-+	int len, result = -1;
- 
- 	if (!urb)
- 		return;
-@@ -630,6 +679,9 @@
- 	case SUCCESS:
- 
- 		switch (iep->ir->remote_type) {
-+		case XBOX_COMPATIBLE:
-+			result = code_check_xbox(iep, len);
-+			break;
- 		case ATI2_COMPATIBLE:
- 			result = code_check_ati2(iep, len);
- 			break;
-@@ -946,6 +998,10 @@
- 	case VENDOR_ATI2:
- 		type = ATI2_COMPATIBLE;
- 		break;
-+	case VENDOR_MS1:
-+	case VENDOR_MS2:
-+		type = XBOX_COMPATIBLE;
-+		break;
- 	default:
- 		dprintk(DRIVER_NAME "[%d]: unknown type\n", devnum);
- 		return NULL;
-@@ -957,6 +1013,8 @@
- 	if ( !(ir = kmalloc(sizeof(*ir), GFP_KERNEL)) ) {
- 		mem_failure = 1;
- 	} else {
-+	        // at this stage we cannot use the macro [DE]CODE_LENGTH: ir is not yet setup
-+	        const int dclen = decode_length[type];
- 		memset(ir, 0, sizeof(*ir));
- 		/* add this infrared remote struct to remote_list, keeping track of
- 		 * the number of drivers registered. */
-@@ -968,13 +1026,13 @@
- 			mem_failure = 2;
- 		} else if (!(rbuf = kmalloc(sizeof(*rbuf), GFP_KERNEL))) {
- 			mem_failure = 3;
--		} else if (lirc_buffer_init(rbuf, CODE_LENGTH, 1)) {
-+		} else if (lirc_buffer_init(rbuf, dclen, 1)) {
- 			mem_failure = 4;
- 		} else {
- 			memset(plugin, 0, sizeof(*plugin));
- 			strcpy(plugin->name, DRIVER_NAME " ");
- 			plugin->minor = -1;
--			plugin->code_length = CODE_LENGTH*8;
-+			plugin->code_length = dclen * 8;
- 			plugin->features = LIRC_CAN_REC_LIRCCODE;
- 			plugin->data = ir;
- 			plugin->rbuf = rbuf;
-
diff --git a/app-misc/lirc/files/lirc-0.8.1-imon-pad2keys.patch b/app-misc/lirc/files/lirc-0.8.1-imon-pad2keys.patch
deleted file mode 100644
index f0b04516ff27..000000000000
--- a/app-misc/lirc/files/lirc-0.8.1-imon-pad2keys.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff -ruN lirc-0.8.1pre5-orig/drivers/lirc_imon/lirc_imon.c lirc-0.8.1pre5/drivers/lirc_imon/lirc_imon.c
---- lirc-0.8.1pre5-orig/drivers/lirc_imon/lirc_imon.c	2007-01-03 18:54:57.000000000 +0100
-+++ lirc-0.8.1pre5/drivers/lirc_imon/lirc_imon.c	2007-01-03 18:55:03.000000000 +0100
-@@ -64,10 +64,27 @@
- #include "drivers/lirc_dev/lirc_dev.h"
- 
- 
-+// imon pad2keys patch
-+//
-+// make PAD and mouse buttons available for use with VDR,
-+// based on pad-mouse-emu patch from venky's forum
-+//
-+// M.Brakemeier 2006-03-31
-+//
-+// generated PAD key codes:
-+// Mouse_N                  0x690281B7
-+// Mouse_S                  0x688291B7
-+// Mouse_W                  0x6A8281B7
-+// Mouse_E                  0x688A81B7
-+//
-+// mouse buttons (non-synthetic):
-+// MouseRightClick          0x688481B7
-+// MouseLeftClick           0x688301B7
-+
- #define MOD_AUTHOR	"Venky Raju <dev@venky.ws>"
--#define MOD_DESC	"Driver for Soundgraph iMON MultiMedian IR/VFD"
-+#define MOD_DESC	"Driver for Soundgraph iMON MultiMedian IR/VFD w/imon pad2keys patch"
- #define MOD_NAME	"lirc_imon"
--#define MOD_VERSION	"0.3"
-+#define MOD_VERSION	"0.3p2k"
- 
- #define VFD_MINOR_BASE	144	/* Same as LCD */
- #define DEVFS_MODE	S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
-@@ -82,6 +99,7 @@
- #define	TRUE		1
- #define FALSE		0
- 
-+#define CURSOR_LIMIT    16
- 
- /* ------------------------------------------------------------
-  *                     P R O T O T Y P E S
-@@ -160,6 +178,10 @@
- 		atomic_t busy;		     /* write in progress         */
- 		int status;		     /* status of tx completion   */
- 	} tx;
-+
-+    int key_x;
-+    int key_y;
-+    int last_count;                      /* number of times pressed   */
- };
- 
- #define LOCK_CONTEXT	down (&context ->sem)
-@@ -250,6 +272,7 @@
- 
- MODULE_AUTHOR (MOD_AUTHOR);
- MODULE_DESCRIPTION (MOD_DESC);
-+MODULE_VERSION(MOD_VERSION);    /* MBr: was missing */
- MODULE_LICENSE ("GPL");
- module_param (debug, int, 0);
- MODULE_PARM_DESC (debug, "Debug messages: 0=no, 1=yes (default: no)");
-@@ -574,6 +597,11 @@
- 	context ->rx.initial_space = 1;
- 	context ->rx.prev_bit = 0;
- 
-+        /* init pad context */
-+        context ->key_x = 0;
-+        context ->key_y = 0;
-+        context ->last_count = 0;
-+
- 	usb_fill_int_urb (context ->rx_urb, context ->dev,
- 		usb_rcvintpipe (context ->dev,
- 				context ->rx_endpoint-> bEndpointAddress),
-@@ -704,6 +732,76 @@
- 
- 		/* The signals have been decoded onboard the iMON controller */
- 
-+    	        /* encode mouse pad as key events */
-+    	        /* we like pad events, not mouse button events*/
-+    	        if((buf[0] & 0x40) &&
-+                   !(buf[1] & 0x01 || buf[1] >> 2 & 0x01))
-+                {
-+                    int rel_x = (buf[1] & 0x08) | (buf[1] & 0x10) >> 2 | (buf[1] & 0x20) >> 4 | (buf[1] & 0x40) >> 6;
-+                    int rel_y = (buf[2] & 0x08) | (buf[2] & 0x10) >> 2 | (buf[2] & 0x20) >> 4 | (buf[2] & 0x40) >> 6;
-+
-+                    if(buf[0] & 0x02)
-+                        rel_x |= ~0x10+1;
-+                    if(buf[0] & 0x01)
-+                        rel_y |= ~0x10+1;
-+
-+                    /* keyboard direction key emulation */
-+                    if( context->last_count > 32 )
-+                    {  /* Hopefully eliminate drift*/
-+                        context->last_count=0;
-+                        context->key_y=0;
-+                        context->key_x=0;
-+                    }
-+                    context->last_count++;
-+
-+                    /* limit decoded events */
-+                    if(abs(context->key_x) > CURSOR_LIMIT || abs(context->key_y) > CURSOR_LIMIT )
-+                    {
-+                        if(abs(context->key_y ) > abs(context->key_x))
-+                        { /* mouse s/n */
-+                            if(context->key_y > 0 && rel_y > 0)
-+                            { /* mouse s */
-+                                buf[0] = 0x68;
-+                                buf[1] = 0x82;
-+                                buf[2] = 0x91;
-+                            }
-+                            else if(context->key_y < 0 && rel_y < 0)
-+                            { /* mouse n */
-+                                buf[0] = 0x69;
-+                                buf[1] = 0x02;
-+                                buf[2] = 0x81;
-+                            }
-+                        }
-+                        else
-+                        { /* mouse e/w*/
-+                            if(context->key_x > 0 && rel_x > 0 )
-+                            { /* mouse e */
-+                                buf[0] = 0x68;
-+                                buf[1] = 0x8A;
-+                                buf[2] = 0x81;
-+                            }
-+                            else if(context->key_x < 0 && rel_x < 0  )
-+                            { /* mouse w */
-+                                buf[0] = 0x6A;
-+                                buf[1] = 0x82;
-+                                buf[2] = 0x81;
-+                            }
-+                        }
-+                    }
-+                    else
-+                    {
-+                        context->key_x += rel_x;
-+                        context->key_y += rel_y;
-+
-+                        return; /* discard those key codes */
-+                    }
-+                }
-+
-+                /* a key was pressed, reset count */
-+                context->key_x = 0;
-+                context->key_y = 0;
-+                context->last_count = 0;
-+
- 		lirc_buffer_write_1 (context ->plugin ->rbuf, buf);
- 		wake_up (&context ->plugin ->rbuf ->wait_poll);
- 		return;
-diff -ruN lirc-0.8.1pre5-orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.1pre5/remotes/imon/lircd.conf.imon-pad
---- lirc-0.8.1pre5-orig/remotes/imon/lircd.conf.imon-pad	2007-01-03 18:54:57.000000000 +0100
-+++ lirc-0.8.1pre5/remotes/imon/lircd.conf.imon-pad	2007-01-03 18:55:03.000000000 +0100
-@@ -1,10 +1,10 @@
- #
- # this config file was automatically generated
--# using lirc-0.7.1pre2(imon) on Tue Mar  1 23:15:44 2005
-+# using lirc-0.8.0(imon_pad) on Mon Jan 23 20:22:11 2006
- #
--# contributed by Venky Raju
-+# contributed by M.Brakemeier
- #
--# brand:                       iMON-New
-+# brand:                       SoundGraph
- # model no. of remote control: iMON-PAD
- # devices being controlled by this remote:
- #
-@@ -22,12 +22,12 @@
-   min_repeat      1
-   toggle_bit      0
- 
--
-       begin codes
-           AppExit                  0x288195B7
-+        Power                    0x289115B7
-           Record                   0x298115B7
-           Play                     0x2A8115B7
--          SlowMotion               0x29B195B7
-+        Open                     0x29B1D5B7
-           Rewind                   0x2A8195B7
-           Pause                    0x2A9115B7
-           FastForward              0x2B8115B7
-@@ -57,15 +57,15 @@
-           0                        0x2BA595B7
-           ShiftTab                 0x28B515B7
-           Tab                      0x29A115B7
--          MyMovie                  0x2B8515B7
--          MyMusic                  0x299195B7
--          MyPhoto                  0x2BA115B7
--          MyTV                     0x28A515B7
-+        Red                      0x2B8515B7 # MyMovie
-+        Green                    0x299195B7 # MyMusic
-+        Blue                     0x2BA115B7 # MyPhoto
-+        Yellow                   0x28A515B7 # MyTV
-           Bookmark                 0x288515B7
-           Thumbnail                0x2AB715B7
-           AspectRatio              0x29A595B7
-           FullScreen               0x2AA395B7
--          MyDVD                    0x29A295B7
-+        Purple                   0x29A295B7 # MyDVD
-           Menu                     0x2BA385B7
-           Caption                  0x298595B7
-           Language                 0x2B8595B7
-@@ -84,6 +84,10 @@
-           Down                     0x6F9ECBB7
-           Right                    0x69A281B7
- 
-+        Mouse_N                  0x690281B7
-+        Mouse_S                  0x688291B7
-+        Mouse_W                  0x6A8281B7
-+        Mouse_E                  0x688A81B7
-       end codes
- 
- end remote 
diff --git a/app-misc/lirc/files/lirc-0.8.1-kernel-2.6.20.diff b/app-misc/lirc/files/lirc-0.8.1-kernel-2.6.20.diff
deleted file mode 100644
index a2526ee888c0..000000000000
--- a/app-misc/lirc/files/lirc-0.8.1-kernel-2.6.20.diff
+++ /dev/null
@@ -1,145 +0,0 @@
---- lirc-0.8.1/drivers/lirc_mceusb2/lirc_mceusb2.c	16 Jan 2007 06:05:27 -0000	1.22
-+++ lirc-0.8.1/drivers/lirc_mceusb2/lirc_mceusb2.c	16 Jan 2007 08:45:04 -0000	1.23
-@@ -264,7 +264,7 @@
- 	async_urb->transfer_buffer_length = size;
- 	async_urb->dev = ir->usbdev;
- 
--	if ((res=usb_submit_urb(async_urb, SLAB_ATOMIC))) {
-+	if ((res=usb_submit_urb(async_urb, GFP_ATOMIC))) {
- 	    dprintk(DRIVER_NAME "[%d]: receive request FAILED! (res=%d)\n", ir->devnum, res);
- 	    return;
- 	}
-@@ -467,7 +467,7 @@
- 	}
- 
- 	/* resubmit urb */
--	usb_submit_urb(urb, SLAB_ATOMIC);
-+	usb_submit_urb(urb, GFP_ATOMIC);
- }
- 
- 
-@@ -703,7 +703,7 @@
- 			mem_failure = 3;
- 		} else if (lirc_buffer_init(rbuf, sizeof(lirc_t), LIRCBUF_SIZE)) {
- 			mem_failure = 4;
--		} else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp, SLAB_ATOMIC, &ir->dma_in))) {
-+		} else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp, GFP_ATOMIC, &ir->dma_in))) {
- 			mem_failure = 5;
- 		} else if (!(ir->urb_in = usb_alloc_urb(0, GFP_KERNEL))) {
- 			mem_failure = 7;
---- lirc-0.8.1/drivers/lirc_atiusb/lirc_atiusb.c	20 Oct 2006 05:03:38 -0000	1.55
-+++ lirc-0.8.1/drivers/lirc_atiusb/lirc_atiusb.c	16 Jan 2007 08:45:04 -0000	1.56
-@@ -251,7 +251,7 @@
- 	add_wait_queue(&oep->wait, &wait);
- 
- #ifdef KERNEL_2_5
--	if (usb_submit_urb(oep->urb, SLAB_ATOMIC)) {
-+	if (usb_submit_urb(oep->urb, GFP_ATOMIC)) {
- #else
- 	if (usb_submit_urb(oep->urb)) {
- #endif
-@@ -323,7 +323,7 @@
- 			iep->urb->dev = ir->usbdev;
- 			dprintk(DRIVER_NAME "[%d]: linking iep 0x%02x (%p)\n", ir->devnum, iep->ep->bEndpointAddress, iep);
- #ifdef KERNEL_2_5
--			if ((rtn = usb_submit_urb(iep->urb, SLAB_ATOMIC)) < 0) {
-+			if ((rtn = usb_submit_urb(iep->urb, GFP_ATOMIC)) < 0) {
- #else
- 			if ((rtn = usb_submit_urb(iep->urb)) < 0) {
- #endif
-@@ -659,7 +659,7 @@
- 
- 	/* resubmit urb */
- #ifdef KERNEL_2_5
--	usb_submit_urb(urb, SLAB_ATOMIC);
-+	usb_submit_urb(urb, GFP_ATOMIC);
- #endif
- }
- 
-@@ -775,7 +775,7 @@
- 		iep->len = len;
- 
- #ifdef KERNEL_2_5
--		if ( !(iep->buf = usb_buffer_alloc(dev, len, SLAB_ATOMIC, &iep->dma)) ) {
-+		if ( !(iep->buf = usb_buffer_alloc(dev, len, GFP_ATOMIC, &iep->dma)) ) {
- 			mem_failure = 2;
- 		} else if ( !(iep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
- 			mem_failure = 3;
-@@ -856,7 +856,7 @@
- 		init_waitqueue_head(&oep->wait);
- 
- #ifdef KERNEL_2_5
--		if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN, SLAB_ATOMIC, &oep->dma)) ) {
-+		if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN, GFP_ATOMIC, &oep->dma)) ) {
- 			mem_failure = 2;
- 		} else if ( !(oep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
- 			mem_failure = 3;
---- lirc-0.8.1/drivers/lirc_mceusb/lirc_mceusb.c	20 Oct 2006 05:03:38 -0000	1.13
-+++ lirc-0.8.1/drivers/lirc_mceusb/lirc_mceusb.c	16 Jan 2007 08:45:04 -0000	1.14
-@@ -768,7 +768,7 @@
- 			dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
- #ifdef KERNEL_2_5
- 			dev->bulk_in_buffer = usb_buffer_alloc
--				(udev, buffer_size, SLAB_ATOMIC, &dev->dma_in);
-+				(udev, buffer_size, GFP_ATOMIC, &dev->dma_in);
- #else
- 			dev->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
- #endif
-@@ -795,7 +795,7 @@
- 			dev->bulk_out_size = buffer_size;
- 			dev->bulk_out_endpointAddr = endpoint->bEndpointAddress;
- #ifdef KERNEL_2_5
--			dev->bulk_out_buffer = usb_buffer_alloc(udev, buffer_size, SLAB_ATOMIC, &dev->dma_out);
-+			dev->bulk_out_buffer = usb_buffer_alloc(udev, buffer_size, GFP_ATOMIC, &dev->dma_out);
- #else
- 			dev->bulk_out_buffer = kmalloc (buffer_size, GFP_KERNEL);
- #endif
---- lirc-0.8.1/drivers/lirc_streamzap/lirc_streamzap.c	1 Dec 2006 04:11:52 -0000	1.18
-+++ lirc-0.8.1/drivers/lirc_streamzap/lirc_streamzap.c	16 Jan 2007 08:45:04 -0000	1.19
-@@ -458,7 +458,7 @@
- 
- #ifdef KERNEL_2_5
- 	/* resubmit only for 2.6 */
--	usb_submit_urb( urb, SLAB_ATOMIC );
-+	usb_submit_urb( urb, GFP_ATOMIC );
- #endif
- 
- 	return;
-@@ -556,7 +556,7 @@
- 	sz->buf_in_len = sz->endpoint->wMaxPacketSize;
- #ifdef KERNEL_2_5
-         if((sz->buf_in = usb_buffer_alloc(sz->udev, sz->buf_in_len,
--					  SLAB_ATOMIC, &sz->dma_in)) == NULL )
-+					  GFP_ATOMIC, &sz->dma_in)) == NULL )
- 	{
-                 goto error;
- 	}
-@@ -715,7 +715,7 @@
- 
- 	sz->urb_in->dev = sz->udev;
- #ifdef KERNEL_2_5
--	if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
-+	if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
- #else
- 	if (usb_submit_urb(sz->urb_in))
- #endif
-@@ -866,7 +866,7 @@
- 
- 		sz->urb_in->dev = sz->udev;
- #ifdef KERNEL_2_5
--		if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
-+		if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
- #else
- 		if (usb_submit_urb(sz->urb_in))
- #endif
---- lirc-0.8.1/drivers/lirc_igorplugusb/lirc_igorplugusb.c	20 Oct 2006 05:03:38 -0000	1.9
-+++ lirc-0.8.1/drivers/lirc_igorplugusb/lirc_igorplugusb.c	16 Jan 2007 08:45:04 -0000	1.10
-@@ -484,7 +484,7 @@
- #if defined(KERNEL_2_5)
- 		} else if (!(ir->buf_in = usb_buffer_alloc(dev, 
- 				DEVICE_BUFLEN+DEVICE_HEADERLEN, 
--                                SLAB_ATOMIC, &ir->dma_in))) {
-+                                GFP_ATOMIC, &ir->dma_in))) {
- 			mem_failure = 5;
- #else
- 		} else if (!(ir->buf_in = kmalloc(
diff --git a/app-misc/lirc/files/lirc-0.8.2-kernel-2.6.22.patch b/app-misc/lirc/files/lirc-0.8.2-kernel-2.6.22.patch
deleted file mode 100644
index 13e6e3a357bd..000000000000
--- a/app-misc/lirc/files/lirc-0.8.2-kernel-2.6.22.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur lirc-0.8.2/drivers/lirc_i2c/lirc_i2c.c lirc-0.8.2.new/drivers/lirc_i2c/lirc_i2c.c
---- lirc-0.8.2/drivers/lirc_i2c/lirc_i2c.c	2007-02-13 00:45:15.000000000 -0600
-+++ lirc-0.8.2.new/drivers/lirc_i2c/lirc_i2c.c	2007-07-23 09:47:51.582717400 -0500
-@@ -420,7 +420,7 @@
- 		   Hauppauge cards, but the data flow is different, so we need
- 		   to deal with it by its own.
- 		 */
--		strcpy(ir->c.name,"Hauppauge IR (PVR150)");
-+		strcpy(ir->c.name,"Hauppauge PVR150");
- 		ir->l.code_length = 13;
- 		ir->l.add_to_buf=add_to_buf_haup_pvr150;
- 		break;
diff --git a/app-misc/lirc/files/lirc-0.8.2-kernel-2.6.23.patch b/app-misc/lirc/files/lirc-0.8.2-kernel-2.6.23.patch
deleted file mode 100644
index be53f123ed6e..000000000000
--- a/app-misc/lirc/files/lirc-0.8.2-kernel-2.6.23.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -u -r -p lirc-0.8.2-orig/drivers/lirc_dev/lirc_dev.c lirc-0.8.2/drivers/lirc_dev/lirc_dev.c
---- lirc-0.8.2-orig/drivers/lirc_dev/lirc_dev.c	2007-02-13 07:45:15.000000000 +0100
-+++ lirc-0.8.2/drivers/lirc_dev/lirc_dev.c	2007-10-11 20:45:01.000000000 +0200
-@@ -880,8 +880,13 @@ static int lirc_dev_init(void)
- 	return SUCCESS;
- 
- out_unregister:
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
-+	/* unregister_chrdev returns void now */
-+	unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
-+#else
- 	if(unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME))
- 		printk(KERN_ERR "lirc_dev: unregister_chrdev failed!\n");
-+#endif
- out:
- 	return -1;
- }
-@@ -905,6 +910,11 @@ int init_module(void)
-  */
- void cleanup_module(void)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
-+	/* unregister_chrdev returns void now */
-+	unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
-+	class_destroy(lirc_class);
-+#else
- 	int ret;
- 
- 	ret = unregister_chrdev(IRCTL_DEV_MAJOR, IRCTL_DEV_NAME);
-@@ -914,6 +924,7 @@ void cleanup_module(void)
- 		printk("lirc_dev: error in module_unregister_chrdev: %d\n", ret);
- 	else
- 		dprintk("lirc_dev: module successfully unloaded\n");
-+#endif
- }
- 
- MODULE_DESCRIPTION("LIRC base driver module");
diff --git a/app-misc/lirc/files/lirc-remotewonderplus.patch b/app-misc/lirc/files/lirc-remotewonderplus.patch
deleted file mode 100644
index 385162cf290d..000000000000
--- a/app-misc/lirc/files/lirc-remotewonderplus.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c.orig	2005-10-29 08:18:53.000000000 -0600
-+++ lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c	2006-04-01 14:31:05.000000000 -0700
-@@ -147,9 +147,9 @@
- /* init strings */
- #define USB_OUTLEN		7
- 
--static char init1[] = {0x01, 0x00, 0x20, 0x14};
--static char init2[] = {0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20};
--
-+static char init1[] = {0x80, 0x05, 0x1b, 0x15, 0x14, 0x20, 0x24, 0x15};
-+static char init2[] = {0x83, 0x03};
-+static char init3[] = {0x84, 0xd7, 0x020};
- 
- 
- struct in_endpt {
-@@ -1034,8 +1034,9 @@
- 			usb_sndintpipe(ir->usbdev, oep->ep->bEndpointAddress), oep->buf,
- 			USB_OUTLEN, usb_remote_send, oep, oep->ep->bInterval);
- 
--		send_packet(oep, 0x8004, init1);
--		send_packet(oep, 0x8007, init2);
-+		send_packet(oep, 0x8007, init1);
-+		send_packet(oep, 0x8002, init2);
-+		send_packet(oep, 0x8003, init3);
- 	}
- }
- 
diff --git a/app-misc/lirc/files/lirc-udev-094.diff b/app-misc/lirc/files/lirc-udev-094.diff
deleted file mode 100644
index ed3c97987546..000000000000
--- a/app-misc/lirc/files/lirc-udev-094.diff
+++ /dev/null
@@ -1,5 +0,0 @@
---- contrib/lirc.rules	25 Sep 2004 09:14:12 -0000	1.1
-+++ contrib/lirc.rules	30 Jun 2006 14:46:49 -0000
-@@ -1 +1 @@
--KERNEL="lirc[0-9]*",	NAME="lirc/%n"

-+KERNEL=="lirc[0-9]*",	NAME="lirc/%n"
diff --git a/app-misc/lirc/files/lircd.conf b/app-misc/lirc/files/lircd.conf
deleted file mode 100644
index 030b02aceea1..000000000000
--- a/app-misc/lirc/files/lircd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Options to pass to the lircd process
-LIRCD_OPTS="-d /dev/lirc/0"