Version bumped. Init-script changes: Now provide lirc, Bug #190669. Use pidfile to allow starting more than one lircd, Bug #212551. This may also fix the Kernel Oops of Bug #218612. Fixed keys in imon-pad2keys config, Bug #219101. Do install all avail remote config files to /usr/share/lirc/remotes and skip the auto-preserving of the old conf-file, Bug #219097.

Package-Manager: portage-2.1.5_rc6

5 files changed, 642 insertions, 5 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 37381999017b..78107b7b6a02 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.175 2008/05/04 04:49:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.176 2008/05/05 09:53:18 zzam Exp $
+
+*lirc-0.8.3 (05 May 2008)
+
+  05 May 2008; Matthias Schwarzott <zzam@gentoo.org> +files/lircd-0.8.3,
+  +files/lirc-0.8.3-imon-pad2keys.patch, +lirc-0.8.3.ebuild:
+  Version bumped. Init-script changes: Now provide lirc, Bug #190669. Use
+  pidfile to allow starting more than one lircd, Bug #212551. This may also
+  fix the Kernel Oops of Bug #218612. Fixed keys in imon-pad2keys config,
+  Bug #219101. Do install all avail remote config files to
+  /usr/share/lirc/remotes and skip the auto-preserving of the old conf-file,
+  Bug #219097.
 
   04 May 2008; Matthias Schwarzott <zzam@gentoo.org> lirc-0.8.3_pre3.ebuild:
   Added imon_knob to possible LIRC_DEVICES, Bug #208719.
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 46610578c1c5..b473083d37ac 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -18,6 +18,7 @@ AUX lirc-0.8.1-imon-pad2keys.patch 8123 RMD160 1dba2af99821ec73b5bc38b9f6733bf3e
 AUX lirc-0.8.1-kernel-2.6.20.diff 5003 RMD160 89d3073e0f0c049c16ece750c06ba4f046340371 SHA1 28bc0258485ff21f7f0725b7e234060958c2e25d SHA256 34d436c19d64e7b9c48173dc84342f251d28733827c3f160da44d394dbd7d099
 AUX lirc-0.8.2-kernel-2.6.22.patch 550 RMD160 789e168d93a1f7c6c329cd0c6f858efef1d13e10 SHA1 03273362cd230f96beb1d0e1978b51cd582f5fa4 SHA256 1e934d597c2f6a918fabe8f54ee4afb4362da778d38a2f5ded0ac5104b906a4d
 AUX lirc-0.8.2-kernel-2.6.23.patch 1224 RMD160 6e780550ddeb24d2ef58702b01c263d6ab7b1695 SHA1 e90c105626a00f724b9444eae57250328154663d SHA256 7a3af1f27df60fdd6f281ea4064cd603e4e429f9989218bce262e954e709dcce
+AUX lirc-0.8.3-imon-pad2keys.patch 11556 RMD160 89a050f7099593000a40b15c46de6137f3b10dfa SHA1 019b1aa3d72df9e4b28796c173fb4fa1fc3e457d SHA256 347c6195d971f8d1a3f4c29a1ff4750d04cea297d16679aeda7529ac1720d42e
 AUX lirc-0.8.3_pre1-imon-pad2keys.patch 10312 RMD160 6f61031cd3035289b2d52797dd02d027f593873d SHA1 c59aab62c9b59e27b93d5613e050438fcf2c6eed SHA256 2f79f223d5d2e998321284c50edea044ad26ab8607eae1e9e79e7c0ea6a8f2cd
 AUX lirc-0.8.3_pre1-kernel-2.6.24.diff 3183 RMD160 f13264a2b4df668ad378a22258f911303da0ef47 SHA1 b9c3b3872841138a0bb484bdebcdedd5fd2b2db8 SHA256 7ef22b75da7740ef51ad2ae94571611684fce49953e32c4a58c7c9a17331716b
 AUX lirc-0.8.3_pre1-remotewonderplus.patch 943 RMD160 05a0696d51ff01c7d9644ad3ff4d56fef20be439 SHA1 971ad8b27d57c31439a1f7fb87dac2dc39d6c1e8 SHA256 547efbfa30f282ba9100495044e3b720c8f74c44f9a4e34db934d2ac7976fe29
@@ -25,6 +26,7 @@ AUX lirc-0.8.3_pre3-imon-pad2keys.patch 11556 RMD160 96137f08691e341844d7ebc8603
 AUX lirc-remotewonderplus.patch 876 RMD160 5fa5bd312f60ec900a38b189134627f2c27449bc SHA1 b13a5c024b0eb6f9b65cb1a795c618832aad39e3 SHA256 12e296b694fa9f3889d191756cd9c3846822ca7e653ee3e26c00bf7bf5a73a88
 AUX lirc-udev-094.diff 192 RMD160 dd7063bba9993b652d6252e861cf8eb2309610e0 SHA1 682ffa82b7f40df87cee3c5309f6efaa94d5cd3a SHA256 05c24a907934efdd90c1f1c8bfaaa1d5b156958451355b9cefdde21fc8977120
 AUX lircd 450 RMD160 73cf3057f420632e90e80eeb30e79cdbb3390b5d SHA1 e43d500a672bf89b7dc5e6bdedc9ed8e90dac3b3 SHA256 a9d6d2cc0abd0efe3267c1477fac012378e63e26aa021cfce7a0e25b27f196df
+AUX lircd-0.8.3 581 RMD160 162a54bb19df7b97aa982355a6d009ddc82580eb SHA1 c0f7a0a65169d02bdc7003d574d8610694241a5d SHA256 9ba3c5a8c0ca5966729dc5e2c7a5960bbf12b443d91e9e319a0277f153df1b1f
 AUX lircd.conf 67 RMD160 9d6e579362e19b1ea2b04acd9b80e25bbfd3ba63 SHA1 81e3cdd5aa0c1d39cfe8986a3a0832ae8da251c8 SHA256 5bfdf541edea0df7a4c2d7d0ce1aec8b0122313645e0b0b7297b97e4ef4fad0e
 AUX lircd.conf.2 315 RMD160 94efda1b445dd2e680ff12c941a854af4428c2a4 SHA1 2cea988bcab226bea90142b98a5315032bd5c5f6 SHA256 d498acd009e3ebd8593c3fa03ddd9e3dce763309e9668733fb5c74e29b8b4420
 AUX lircmd 466 RMD160 32f2b2411afc60522944f5c3dff9f53aac242a9c SHA1 79939de790d20704009643bd810e3186090d0e36 SHA256 d47f22a33a83c14a4a0c333d6a445c40e550c491899fb0c6d323e23fe1eac7b7
@@ -34,6 +36,7 @@ DIST lirc-0.8.0.tar.bz2 514359 RMD160 045c95754820e77891bd0b3baa269ad3f04cba8c S
 DIST lirc-0.8.1.tar.bz2 604524 RMD160 effba27a6aaa4a39d206d9d9e7cccc72edcd5fb5 SHA1 c26297b90bd0609c52d6f31062c3ecc13cb945f0 SHA256 86ea19a768e8b8a9ac19daf403ac8b017f7a20d2764e6e78267099094e4f9a1b
 DIST lirc-0.8.2.tar.bz2 634331 RMD160 e806608f8644a1d1f66689a40b2ed27b4cf43bd9 SHA1 84025603692836106714a2895e6201f6eb60ab37 SHA256 717e62ee763bad9c1ffc25dd096a8845d252eaa050f16f67c6fe3506194e7f62
 DIST lirc-0.8.2pre2.tar.bz2 620341 RMD160 fceef5aeec5a1fc8c3a0225ed165be3798ebeae9 SHA1 9bb041ddcc85effbba01e3a97d2d43c9516e5130 SHA256 c4fddca1f61234fbfd2517acadfbe85d99470d90132bf800bb324a9025b57f6a
+DIST lirc-0.8.3.tar.bz2 667882 RMD160 8948efc3e9dc34426ea32a3c63da63c0efa7dce2 SHA1 4b5aec19fa9ee15bafaeb1f87c154a0d4e045dcc SHA256 8190c84fb40376380c163009808df4bd25bac53890261a48c522bb9ccad5723f
 DIST lirc-0.8.3pre1.tar.bz2 656112 RMD160 b83f7c3222d0a8f6aa9924c7bd60013f29b7917c SHA1 ef5f3bd60ed10d4d1ab57931f8871cf9f8735630 SHA256 435e5f5301fb0d4488a5b9c8340b686a21dc542c2fbf97910c8d0f1350667192
 DIST lirc-0.8.3pre3.tar.bz2 668214 RMD160 01a5028ea0563626904f0e49644b81f9cbb85850 SHA1 9cb1a7e666e5a4c4db4f8ca1f08b173ecfb42bfd SHA256 a799ce95d1a09db040c7781bcaa5ffe839eb987e56858ebc54f73e609b827029
 EBUILD lirc-0.8.0-r8.ebuild 8359 RMD160 edd6722efa42aca85aeeb69c3f06f9c63f6881f2 SHA1 b832bc32f721c506fe04b1a2c037ecd480e5d6de SHA256 daf67f5c1b420a4080180d9009a2121f74acdb9cbc0e42b5806c1f5d8964a87e
@@ -42,14 +45,15 @@ EBUILD lirc-0.8.2-r1.ebuild 8282 RMD160 9b9d86196447c1e4fce2ecaeaa2ed7366a74f427
 EBUILD lirc-0.8.2-r2.ebuild 8282 RMD160 627a3bb4a947ea89fd90a4c93cac12f1358976ff SHA1 48a1e54270a1e278ed66f95aebae5b400549f604 SHA256 fbbc8acf489dda1909d6bc490e25f238d439900ecaac3eb4794cc7f98b4ec51a
 EBUILD lirc-0.8.2.ebuild 7749 RMD160 15289a7b2c51dcf4c32c399b16861f5e73c30965 SHA1 9338e58f0351a7eab10837b07253c4b5be6eeb6d SHA256 de6312c8bc46974d99c73f958843f2c143994ed68c18cc964d30aa1405c94998
 EBUILD lirc-0.8.2_pre2.ebuild 7768 RMD160 2437273d778a5ba426026aaafab4e2528c4619e6 SHA1 ad1d97b3110636f3733c46318cd54fc1f08a8549 SHA256 b35bdae2c7011fb84d2279d12de811dbc128266d197f83e4bb70bb9e5c8ec67b
+EBUILD lirc-0.8.3.ebuild 8443 RMD160 39d10424fc6afd199ce598f8efe62aa6478aef97 SHA1 2445bd99b5e66c8b42b3c5617e1db7ba93470603 SHA256 19f248611f826549e56625eadb8d7798fe758b0aa60d86bb7c59dd5599db4baa
 EBUILD lirc-0.8.3_pre1.ebuild 8413 RMD160 5c1aad354c21af1c0e59a7664a618b4f845e4807 SHA1 b60cfb14611ba87df67cde41070f7c3b90e467a5 SHA256 aa2c154981ed8998d701e74744a73f84a758c2cfb69b2a4a07e2b6d42d75e932
 EBUILD lirc-0.8.3_pre3.ebuild 8326 RMD160 126919dbe2680331d22682df852b5e5636c8709b SHA1 77751b8e0dc6b5661e4def741c7118aeef19baf8 SHA256 6669f8b4a107c1952c28bc56173540a4e2075eb652d8b7c81e7c99afac11dd2c
-MISC ChangeLog 26884 RMD160 ab3516d4100467033cb046c886beeaac83356216 SHA1 4dfebf154b74b38e0f70275f48462c26a00ccdda SHA256 8483e91a63f720f3f01d51da8b65b67da00fed99ddde8211ae3a22c74542f317
+MISC ChangeLog 27421 RMD160 a5c07bde333f8e8b8d3ad8e3963f6cf115a5be52 SHA1 4efece4056c49b9c2c0a86a523a1fbe162a8acde SHA256 d31b656ae78da2d28f7b94010b854bd01b6d416fd27c71a39e28bbc6cc6b671e
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgdQGEACgkQt2vP6XvVdOe6WwCfQ+/bTZ82emndIui5MZuIW10E
-JsIAmwcNM+M11NkQOxWfUeXcboInG2Qi
-=kayj
+iEYEARECAAYFAkge2RcACgkQt2vP6XvVdOdSlwCbB0ZpGwzPp7rtxdSYKOn2cHmI
+q20AoNyfmwXpxbJ55z9DduV96HYgFUnj
+=igjv
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lirc-0.8.3-imon-pad2keys.patch b/app-misc/lirc/files/lirc-0.8.3-imon-pad2keys.patch
new file mode 100644
index 000000000000..578489db446f
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.3-imon-pad2keys.patch
@@ -0,0 +1,291 @@
+diff -ruN lirc-0.8.3pre3-orig/drivers/lirc_imon/lirc_imon.c lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c
+--- lirc-0.8.3pre3-orig/drivers/lirc_imon/lirc_imon.c	2008-04-28 22:15:54.281654857 +0200
++++ lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c	2008-04-28 22:16:51.381649620 +0200
+@@ -73,9 +73,9 @@
+ 
+ 
+ #define MOD_AUTHOR	"Venky Raju <dev@venky.ws>"
+-#define MOD_DESC	"Driver for Soundgraph iMON MultiMedia IR/VFD"
++#define MOD_DESC	"Driver for Soundgraph iMON MultiMedia 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 | \
+@@ -91,6 +91,7 @@
+ #define	TRUE		1
+ #define FALSE		0
+ 
++#define CURSOR_LIMIT    16
+ 
+ /* ------------------------------------------------------------
+  *		     P R O T O T Y P E S
+@@ -177,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)
+@@ -248,6 +253,9 @@
+ static int is_lcd; /* If LIRC_IMON_LCD not defined, default to non-LCD */
+ #endif
+ 
++/* pad2keys module parameter. pad2keys patch active? */
++static int pad2keys_active = 0;
++
+ #if !defined(KERNEL_2_5)
+ 
+ #define MAX_DEVICES	4	/* In case there's more than one iMON device */
+@@ -271,6 +279,7 @@
+ 
+ MODULE_AUTHOR(MOD_AUTHOR);
+ MODULE_DESCRIPTION(MOD_DESC);
++MODULE_VERSION(MOD_VERSION);    /* MBr: was missing */
+ MODULE_LICENSE("GPL");
+ MODULE_DEVICE_TABLE(usb, imon_usb_id_table);
+ 
+@@ -287,6 +296,9 @@
+ 		 "1=yes (default:no)");
+ #endif
+ 
++module_param (pad2keys_active, int, 0);
++MODULE_PARM_DESC (pad2keys_active, "pad2keys patch active: 0=no, 1=yes (default: no)");
++ 
+ static inline void delete_context(struct imon_context *context)
+ {
+ 	if (context->vfd_supported)
+@@ -766,6 +778,11 @@
+ 	context->rx.initial_space = 1;
+ 	context->rx.prev_bit = 0;
+ 
++        /* init pad context for pad2keys */
++        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),
+@@ -915,6 +932,94 @@
+ 
+ 	if (context->ir_onboard_decode) {
+ 		/* The signals have been decoded onboard the iMON controller */
++                
++                if (pad2keys_active)
++                {
++                   /* imon pad2keys patch
++                    *
++                    * make PAD and mouse buttons available for use with VDR,
++                    * based on pad-mouse-emu patch from venky's forum
++                    *
++                    * last change: M.Brakemeier 2007-10-14
++                    *
++                    * generated PAD key codes:
++                    * Mouse_N                  0x690281B7
++                    * Mouse_S                  0x688291B7
++                    * Mouse_W                  0x6A8281B7
++                    * Mouse_E                  0x688A81B7
++                    *
++                    * mouse buttons (non-synthetic):
++                    * MouseRightClick          0x688481B7
++                    * MouseLeftClick           0x688301B7
++                    */
++                    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.3pre3-orig/drivers/lirc_imon/lirc_imon.c.rej lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c.rej
+--- lirc-0.8.3pre3-orig/drivers/lirc_imon/lirc_imon.c.rej	1970-01-01 01:00:00.000000000 +0100
++++ lirc-0.8.3pre3/drivers/lirc_imon/lirc_imon.c.rej	2008-04-28 22:16:02.941653915 +0200
+@@ -0,0 +1,26 @@
++***************
++*** 271,280 ****
++  
++  MODULE_AUTHOR(MOD_AUTHOR);
++  MODULE_DESCRIPTION(MOD_DESC);
++  MODULE_LICENSE("GPL");
++  MODULE_DEVICE_TABLE(usb, imon_usb_id_table);
++  module_param(debug, int, 0);
++  MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)");
++  
++  static inline void delete_context(struct imon_context *context)
++  {
++--- 279,291 ----
++  
++  MODULE_AUTHOR(MOD_AUTHOR);
++  MODULE_DESCRIPTION(MOD_DESC);
+++ MODULE_VERSION(MOD_VERSION);    /* MBr: was missing */
++  MODULE_LICENSE("GPL");
++  MODULE_DEVICE_TABLE(usb, imon_usb_id_table);
++  module_param(debug, int, 0);
++  MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)");
+++ module_param (pad2keys_active, int, 0);
+++ MODULE_PARM_DESC (pad2keys_active, "pad2keys patch active: 0=no, 1=yes (default: no)");
++  
++  static inline void delete_context(struct imon_context *context)
++  {
+diff -ruN lirc-0.8.3pre3-orig/remotes/imon/lircd.conf.imon-pad2keys lirc-0.8.3pre3/remotes/imon/lircd.conf.imon-pad2keys
+--- lirc-0.8.3pre3-orig/remotes/imon/lircd.conf.imon-pad2keys	1970-01-01 01:00:00.000000000 +0100
++++ lirc-0.8.3pre3/remotes/imon/lircd.conf.imon-pad2keys	2008-04-28 22:16:02.941653915 +0200
+@@ -0,0 +1,88 @@
++# Please make this file available to others

++# by sending it to <lirc@bartelmus.de>

++#

++# this config file was generated

++# using lirc-0.8.3pre1 (imon w/pad2keys patch)

++#

++# contributed by M.Brakemeier

++#

++# brand:                       SoundGraph

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

++# devices being controlled by this remote:

++#

++

++begin remote

++

++  name     iMON-PAD

++  bits           32

++  eps            30

++  aeps          100

++

++  one             0     0

++  zero            0     0

++  gap          235965

++  min_repeat      1

++  toggle_bit      0

++

++    begin codes

++        AppExit                  0x288195B7

++        Power                    0x289115B7

++        Record                   0x298115B7

++        Play                     0x2A8115B7

++        Open                     0x29B1D5B7

++        Rewind                   0x2A8195B7

++        Pause                    0x2A9115B7

++        FastForward              0x2B8115B7

++        PrevChapter              0x2B9115B7

++        Stop                     0x2B9715B7

++        NextChapter              0x298195B7

++        Esc                      0x2BB715B7

++        Eject                    0x299395B7

++        AppLauncher              0x29B715B7

++        MultiMon                 0x2AB195B7

++        TaskSwitcher             0x2A9395B7

++        Mute                     0x2B9595B7

++        Vol+                     0x28A395B7

++        Vol-                     0x28A595B7

++        Ch+                      0x289395B7

++        Ch-                      0x288795B7

++        Timer                    0x2B8395B7

++        1                        0x28B595B7

++        2                        0x2BB195B7

++        3                        0x28B195B7

++        4                        0x2A8595B7

++        5                        0x299595B7

++        6                        0x2AA595B7

++        7                        0x2B9395B7

++        8                        0x2A8515B7

++        9                        0x2AA115B7

++        0                        0x2BA595B7

++        ShiftTab                 0x28B515B7

++        Tab                      0x29A115B7

++        Red                      0x2B8515B7 # MyMovie

++        Green                    0x299195B7 # MyMusic

++        Blue                     0x2BA115B7 # MyPhoto

++        Yellow                   0x28A515B7 # MyTV

++        Bookmark                 0x288515B7

++        Thumbnail                0x2AB715B7

++        AspectRatio              0x29A595B7

++        FullScreen               0x2AA395B7

++        Purple                   0x29A395B7 # MyDVD

++        Menu                     0x2BA395B7

++        Caption                  0x298595B7

++        Language                 0x2B8595B7

++        MouseKeyboard            0x299115B7

++        SelectSpace              0x2A9315B7

++        MouseMenu                0x28B715B7

++        MouseRightClick          0x688481B7

++        Enter                    0x28A195B7

++        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/lircd-0.8.3 b/app-misc/lirc/files/lircd-0.8.3
new file mode 100644
index 000000000000..8cd7a0a7e77c
--- /dev/null
+++ b/app-misc/lirc/files/lircd-0.8.3
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/files/lircd-0.8.3,v 1.1 2008/05/05 09:53:19 zzam Exp $
+
+PIDFILE=/var/run/${SVCNAME}.pid
+
+depend() {
+	provide lirc
+}
+
+start() {
+	ebegin "Starting lircd"
+	start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec /usr/sbin/lircd -- \
+		-P "${PIDFILE}" ${LIRCD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping lircd"
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" --exec /usr/sbin/lircd
+	eend $?
+}
diff --git a/app-misc/lirc/lirc-0.8.3.ebuild b/app-misc/lirc/lirc-0.8.3.ebuild
new file mode 100644
index 000000000000..b36adb78df3b
--- /dev/null
+++ b/app-misc/lirc/lirc-0.8.3.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3.ebuild,v 1.1 2008/05/05 09:53:18 zzam Exp $
+
+inherit eutils linux-mod flag-o-matic autotools
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+MY_P=${PN}-${PV/_/}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+	SRC_URI="http://lirc.sourceforge.net/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug doc X hardware-carrier transmitter"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+	)
+	lirc_devices_alsa_usb? ( media-libs/alsa-lib )
+	lirc_devices_audio? ( media-libs/portaudio )
+	lirc_devices_irman? ( media-libs/libirman )"
+
+# This are drivers with names matching the
+# parameter --with-driver=NAME
+IUSE_LIRC_DEVICES_DIRECT="
+	all userspace accent act200l act220l
+	adaptec alsa_usb animax asusdh atilibusb
+	atiusb audio audio_alsa avermedia avermedia_vdomate
+	avermedia98 bestbuy bestbuy2 breakoutbox
+	bte bw6130 caraca chronos cmdir
+	cph06x creative creative_infracd
+	devinput digimatrix dsp dvico ea65
+	exaudio flyvideo gvbctv5pci hauppauge
+	hauppauge_dvb hercules_smarttv_stereo
+	igorplugusb imon imon_knob imon_pad imon_rsc
+	irdeo irdeo_remote irman irreal it87
+	knc_one kworld leadtek_0007 leadtek_0010
+	leadtek_pvr2000 livedrive_midi
+	livedrive_seq logitech macmini mceusb
+	mceusb2 mediafocusI mouseremote
+	mouseremote_ps2 mp3anywhere nslu2
+	packard_bell parallel pcmak pcmak_usb
+	pctv pixelview_bt878 pixelview_pak
+	pixelview_pro provideo realmagic
+	remotemaster sa1100 sasem sb0540 serial
+	silitek sir slinke streamzap tekram
+	tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2
+	uirt2_raw usb_uirt_raw usbx"
+
+# drivers that need special handling and
+# must have another name specified for
+# parameter --with-driver=NAME
+IUSE_LIRC_DEVICES_SPECIAL="
+	imon_pad2keys serial_igor_cesko
+	remote_wonder_plus xboxusb usbirboy inputlirc"
+
+IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
+
+#device-driver which use libusb
+LIBUSB_USED_BY_DEV="
+	all atilibusb sasem igorplugusb imon imon_pad imon_pad2keys
+	imon_rsc streamzap mceusb mceusb2 xboxusb"
+
+for dev in ${LIBUSB_USED_BY_DEV}; do
+	RDEPEND="${RDEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
+done
+
+# adding only compile-time depends
+DEPEND="${RDEPEND}
+	virtual/linux-sources"
+
+# adding only run-time depends
+RDEPEND="${RDEPEND}
+	lirc_devices_usbirboy? ( app-misc/usbirboy )
+	lirc_devices_inputlirc? ( app-misc/inputlircd )"
+
+# add all devices to IUSE
+for dev in ${IUSE_LIRC_DEVICES}; do
+	IUSE="${IUSE} lirc_devices_${dev}"
+done
+
+add_device() {
+	: ${lirc_device_count:=0}
+	((lirc_device_count++))
+
+	if [[ ${lirc_device_count} -eq 2 ]]; then
+		ewarn
+		ewarn "When selecting multiple devices for lirc to be supported,"
+		ewarn "it can not be garanteed that the drivers play nice together."
+		ewarn
+		ewarn "If this is not intended, then abort emerge now with Ctrl-C,"
+		ewarn "Set LIRC_DEVICES and restart emerge."
+		ewarn
+		epause
+	fi
+
+	local dev="${1}"
+	local desc="device ${dev}"
+	if [[ -n "${2}" ]]; then
+		desc="${2}"
+	fi
+
+	elog "Compiling support for ${desc}"
+	MY_OPTS="${MY_OPTS} --with-driver=${dev}"
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	# set default configure options
+	MY_OPTS=""
+	LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+	if use lirc_devices_all; then
+		# compile in drivers for a lot of devices
+		add_device all "a lot of devices"
+	else
+		# compile in only requested drivers
+		local dev
+		for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
+			if use lirc_devices_${dev}; then
+				add_device ${dev}
+			fi
+		done
+
+		if use lirc_devices_remote_wonder_plus; then
+			add_device atiusb "device Remote Wonder Plus (atiusb-based)"
+		fi
+
+		if use lirc_devices_serial_igor_cesko; then
+			add_device serial "serial with Igor Cesko design"
+			MY_OPTS="${MY_OPTS} --with-igor"
+		fi
+
+		if use lirc_devices_imon_pad2keys; then
+			add_device imon_pad "device imon_pad (with converting pad input to keyspresses)"
+			ewarn "You need to set the option pad2keys_active=1"
+			ewarn "when loading the module lirc_imon"
+		fi
+
+		if use lirc_devices_xboxusb; then
+			add_device atiusb "device xboxusb"
+		fi
+
+		if use lirc_devices_usbirboy; then
+			add_device userspace "device usbirboy"
+			LIRC_DRIVER_DEVICE="/dev/usbirboy"
+		fi
+
+		if [[ "${MY_OPTS}" == "" ]]; then
+			if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
+				# on xbox: use special driver
+				add_device atiusb "device xboxusb"
+			else
+				# no driver requested
+				elog
+				elog "Compiling only the lirc-applications, but no drivers."
+				elog "Enable drivers with LIRC_DEVICES if you need them."
+				MY_OPTS="--with-driver=userspace"
+			fi
+		fi
+	fi
+
+	use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier"
+	use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter"
+
+	if [[ -n "${LIRC_OPTS}" ]] ; then
+		ewarn
+		ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on."
+		ewarn
+		ewarn "Please use LIRC_DEVICES from now on."
+		ewarn "e.g. LIRC_DEVICES=\"serial sir\""
+		ewarn
+		ewarn "Flags are now set per use-flags."
+		ewarn "e.g. transmitter, hardware-carrier"
+
+		local opt
+		local unsupported_opts=""
+
+		# test for allowed options for LIRC_OPTS
+		for opt in ${LIRC_OPTS}; do
+			case ${opt} in
+				--with-port=*|--with-irq=*|--with-timer=*|--with-tty=*)
+					MY_OPTS="${MY_OPTS} ${opt}"
+					;;
+				*)
+					unsupported_opts="${unsupported_opts} ${opt}"
+					;;
+			esac
+		done
+		if [[ -n ${unsupported_opts} ]]; then
+			ewarn "These options are no longer allowed to be set"
+			ewarn "with LIRC_OPTS: ${unsupported_opts}"
+			die "LIRC_OPTS is no longer recommended."
+		fi
+	fi
+
+	# Setup parameter for linux-mod.eclass
+	MODULE_NAMES="lirc(misc:${S})"
+	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)
+					$(use_with X x)
+					${MY_OPTS}"
+
+	einfo
+	einfo "lirc-configure-opts: ${MY_OPTS}"
+	elog  "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
+
+	filter-flags -Wl,-O1
+
+	# force non-parallel make, Bug 196134
+	MAKEOPTS="${MAKEOPTS} -j1"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Rip out dos CRLF
+	edos2unix contrib/lirc.rules
+
+	# Apply patches needed for some special device-types
+	epatch "${FILESDIR}"/${P}-imon-pad2keys.patch
+	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch
+
+	# remove parallel driver on SMP systems
+	if linux_chkconfig_present SMP ; then
+		sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am
+	fi
+
+	# Bug #187418
+	if kernel_is ge 2 6 22 ; then
+		ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+"
+		sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
+	fi
+
+	# respect CFLAGS
+	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac
+
+	# setting default device-node
+	sed -i -e '/#define LIRC_DRIVER_DEVICE/d' configure.ac acconfig.h
+	echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	newinitd "${FILESDIR}"/lircd-0.8.3 lircd
+	newinitd "${FILESDIR}"/lircmd lircmd
+	newconfd "${FILESDIR}"/lircd.conf.2 lircd
+
+	insinto /etc/modprobe.d/
+	newins "${FILESDIR}"/modulesd.lirc lirc
+
+	newinitd "${FILESDIR}"/irexec-initd irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
+
+	if use doc ; then
+		dohtml doc/html/*.html
+		insinto /usr/share/doc/${PF}/images
+		doins doc/images/*
+	fi
+
+	insinto /usr/share/lirc/remotes
+	doins -r remotes/*
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	echo
+	elog "The lirc Linux Infrared Remote Control Package has been"
+	elog "merged, please read the documentation at http://www.lirc.org"
+	echo
+
+	if kernel_is ge 2 6 22 ; then
+		# Bug #187418
+		ewarn
+		ewarn "The lirc_gpio driver will not work with Kernels 2.6.22+"
+		ewarn "You need to switch over to /dev/input/event? if you need gpio"
+		ewarn "This device can than then be used via lirc's dev/input driver."
+		ewarn
+	fi
+
+	elog
+	elog "lirc now uses normal config-protection for lircd.conf."
+	elog "If you need any other lircd.conf you may have a look at"
+	elog "the directory /usr/share/lirc/remotes"
+}