Add Kernel 2.6.27 compatibility to lirc-0.8.3-r2. Fixes bug #236713, thanks to James <cctsurf at gmail dot com> for the patch. Committed with permission of beandog

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.25.9 x86_64

4 files changed, 53 insertions, 7 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index d3da2917f164..d7d8c0672fd5 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.190 2008/11/17 20:18:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.191 2008/12/25 13:30:54 gentoofan23 Exp $
+
+  25 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  +files/lirc-0.8.3-kernel-2.6.27.diff, lirc-0.8.3-r2.ebuild:
+  Add Kernel 2.6.27 compatibility to lirc-0.8.3-r2. Fixes bug #236713, thanks
+  to James <cctsurf at gmail dot com> for the patch. Committed with permission
+  of beandog
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/lirc-0.8.3_pre1-kernel-2.6.24.diff:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 393d9e96d960..11773b3f4d22 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -20,6 +20,7 @@ AUX lirc-0.8.2-kernel-2.6.22.patch 550 RMD160 789e168d93a1f7c6c329cd0c6f858efef1
 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-kernel-2.6.26.diff 3233 RMD160 654d6375f8b0a4e45ce2c60d18581cb2dc7c38a3 SHA1 3465689927bd998fcd4e6875ccc004346c93c4cf SHA256 2e70c6806dc24e0c3288f55f5a20ad7484e05752ca8efd5254e3be3ff73cbefd
+AUX lirc-0.8.3-kernel-2.6.27.diff 1253 RMD160 9ece885b51b356ef1001f5f58fb913e1931365a6 SHA1 8da93ede404e425bcc676079129ba70e8f581a4b SHA256 64c0e4d7bca25d07f903352329445f6e95c42edd73b21ac040e190609f34807f
 AUX lirc-0.8.3-pa19.patch 1954 RMD160 bb90abc0c35fd5e9827ca993bca51d3075ccb3b8 SHA1 7cae24797dd132a226293bd1e47d87505be4c37a SHA256 d5c4959c78a4f83bc494788c45da2ec5fe7d5c1362f82136233068cc2e87ca8e
 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 3140 RMD160 ad09e63973827b180530c63a6c49c4e180629198 SHA1 e66cae5faf48a7f9e8d7e391b3fdf6f8984e2074 SHA256 d992cca976d34d7e78a3709908852b828722a9ef18d7ee2151cd1e9de9b529d3
@@ -51,17 +52,17 @@ EBUILD lirc-0.8.2-r2.ebuild 8282 RMD160 627a3bb4a947ea89fd90a4c93cac12f1358976ff
 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-r1.ebuild 8698 RMD160 b108d0316377d6a4e11fd5d9fab4cc5e02e65662 SHA1 438475aa6bc91aa204c0156ed9c0341bd7ca6804 SHA256 c70eae35c30e23c2433147a0d68aa24ae0737355735eae204ce4372bb07f3cbd
-EBUILD lirc-0.8.3-r2.ebuild 8907 RMD160 b2b7907c65ecac8d441fec83cfd03b6096e6d458 SHA1 ec3767e52eb34a9a1b1014adf34bc05d80983472 SHA256 947e150dcb72fd1c012a4c9b823811450dcff6f099b223eb06982df4e935defb
+EBUILD lirc-0.8.3-r2.ebuild 8957 RMD160 2e5eb6b6897070abc13f0247784fd6024eacea11 SHA1 40b77798daa436924dea714eabc2ada77cd31283 SHA256 62c5ba04cb39614a8e2ff6da20331aa6e6abd76a572a7995b0dad49e9f98d4b3
 EBUILD lirc-0.8.3.ebuild 8652 RMD160 fdc60c58f390233998f6ec6e1d6fd6086816f270 SHA1 e1aeadecc5e690b5bcd08c547c93e03c715c0524 SHA256 c8270e080d2b5f1cea016b5a9cf12589c11ce1e18d4480a981a93c6d94fdb844
 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
 EBUILD lirc-0.8.4.ebuild 8814 RMD160 79901465fbe19ec5883a4e000b9bc522b226b36f SHA1 beba0e42dcbaa826bc06c21e87b105aa163b6fa7 SHA256 1fea9cd4ed2e7cb171ae879b669c6ebbb0cbf2dbbc191ff98d2e5c1366a059c5
-MISC ChangeLog 29633 RMD160 3a0e5655f0a83a4c88a267250aacc7c676b67bc8 SHA1 f4004df7547ea81ac4c1a2866eecf0e666291e43 SHA256 c9e02122c55d9266e4ac761a0a6230486eff5669ba8da61f979022bcbc085f81
+MISC ChangeLog 29924 RMD160 5301898b118e67488797de608c248c3cc25f5401 SHA1 c529699e363baf4faac710bda55ec36d2ac107d5 SHA256 398c2e7385c1346fb1ea332e12ddb1295019563b12d225cac142b8d837a49cef
 MISC metadata.xml 376 RMD160 7b854dad1999c38592eabe928aab80615ba1f1e5 SHA1 17dc9c9591c77aa4ec2d98b9bc1f34ff68da31ad SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkh0YMACgkQAiZjviIA2XjjRQCfSaDADwH6M5Sa5YifWrluRx20
-5WcAmwYEHnr6TQZq5RkMyilSC4Ce33kk
-=bF4/
+iEYEARECAAYFAklTixkACgkQF6yMcaBxwHl2fgCdGuYcdN9vfdpcw/ECYQmI9m0S
+CKgAoIa6xgoo+s+idHDLi2vUlJydqvOG
+=aedT
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.27.diff b/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.27.diff
new file mode 100644
index 000000000000..c9149737100c
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.27.diff
@@ -0,0 +1,38 @@
+Index: drivers/lirc_dev/lirc_dev.c
+===================================================================
+RCS file: /cvsroot/lirc/lirc/drivers/lirc_dev/lirc_dev.c,v
+retrieving revision 1.58
+diff -u -p -u -p -r1.58 lirc_dev.c
+--- drivers/lirc_dev/lirc_dev.c 14 May 2008 16:37:49 -0000 1.58
++++ drivers/lirc_dev/lirc_dev.c 4 Aug 2008 14:54:04 -0000
+@@ -49,7 +49,11 @@
+ #include <linux/uaccess.h>
+ #include <linux/errno.h>
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
+ #include <asm/semaphore.h>
++#else
++#include <linux/semaphore.h>
++#endif
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #include <linux/wrapper.h>
+ #endif
+Index: drivers/lirc_i2c/lirc_i2c.c
+===================================================================
+RCS file: /cvsroot/lirc/lirc/drivers/lirc_i2c/lirc_i2c.c,v
+retrieving revision 1.46
+diff -u -p -u -p -r1.46 lirc_i2c.c
+--- drivers/lirc_i2c/lirc_i2c.c 4 May 2008 13:49:53 -0000 1.46
++++ drivers/lirc_i2c/lirc_i2c.c 4 Aug 2008 14:54:04 -0000
+@@ -54,7 +54,11 @@
+ #include <linux/i2c.h>
+ #include <linux/i2c-algo-bit.h>
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
+ #include <asm/semaphore.h>
++#else
++#include <linux/semaphore.h>
++#endif
+ 
+ #include "drivers/kcompat.h"
+ #include "drivers/lirc_dev/lirc_dev.h" 
diff --git a/app-misc/lirc/lirc-0.8.3-r2.ebuild b/app-misc/lirc/lirc-0.8.3-r2.ebuild
index 01a132047018..f2e5e427c8e5 100644
--- a/app-misc/lirc/lirc-0.8.3-r2.ebuild
+++ b/app-misc/lirc/lirc-0.8.3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.7 2008/08/08 20:45:14 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3-r2.ebuild,v 1.8 2008/12/25 13:30:54 gentoofan23 Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -241,6 +241,7 @@ src_unpack() {
 	edos2unix contrib/lirc.rules
 
 	epatch "${FILESDIR}/${P}-kernel-2.6.26.diff"
+	epatch "${FILESDIR}/${P}-kernel-2.6.27.diff"
 
 	# Apply patches needed for some special device-types
 	epatch "${FILESDIR}"/${P}-imon-pad2keys.patch