added err() to kcompat.h as has been removed from usb.h in kernels >=3.5, fixing bug 444736

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 27 insertions, 7 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 31afb03c97be..3a4a22e4bd4a 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/lirc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.233 2012/10/24 18:39:12 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.234 2012/11/27 18:49:26 axs Exp $
+
+  27 Nov 2012; Ian Stakenvicius <axs@gentoo.org> lirc-0.9.0-r2.ebuild,
+  +files/lirc-0.9.0-kernel-3.5-err-fix.patch:
+  added err() to kcompat.h as has been removed from usb.h in kernels >=3.5,
+  fixing bug 444736
 
   24 Oct 2012; Ian Stakenvicius <axs@gentoo.org> lirc-0.9.0-r2.ebuild,
   +files/lirc-0.9.0-kernel-3.3.0-fixes.patch:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 86d310fce4be..bd5841544872 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -9,6 +9,7 @@ AUX lirc-0.8.4-portaudio_check.patch 769 SHA256 01e2034aaa6a7eb039e5c0e6c3b4a6ed
 AUX lirc-0.9.0-atiusb_kfifo.patch 437 SHA256 b7950ee185588a3626b8024cb22c0e67c8514362f5c9cb74bfcead8018e11b02 SHA512 d072ecd94ed4b7f1662441106650b7eb329cbe62887819c1e607ae87375a17dedea02a3a5dcf6956a1151743fd652ec5884577c595771740eef509daab8dbd02 WHIRLPOOL f0013dd75d6cf3486cddbea4e97e7ca9962af882befc5e994f258d1eb5e77e09379c4ca246e407f4c7ad5438b860e0e3b0abb2cade6f04b101525f060188ed03
 AUX lirc-0.9.0-kernel-2.6.39-fixes.patch 2175 SHA256 f5f48c867716288835a73b8d29aa9b1fcc4905a723e1f99e35fe396b2c759957 SHA512 a502b815cec565a49382e9ad0e7237a9bc7da431f41e94db42d214655577212606500ea2651a298db8cd3a68ce706461e6a773b0d9e3316ac7d49b2038fda354 WHIRLPOOL f1968f51cc29ce4f630c59c964d106e024f4cb3e5938ea80b271800a65d130a42531db5fe6e220ae20577cd4f1998de09e5dbdf52ff1cf6f3839922dd9ece114
 AUX lirc-0.9.0-kernel-3.3.0-fixes.patch 1545 SHA256 f02e7b3c52dd17e179b6f89afc15f5eec2889a18f1df4523df680fbf50adb584 SHA512 75743844d7fe61a91174c1d7ee78a229e347659a35d1062a704c39e424d8a433efac4216a0b840282c38a4f2f22baa7a489c1c0402a40f734e7475992046a2ae WHIRLPOOL 871523dc5a9757d170b740acd9845b0ba42c4c5c4c5fdc71b5c701cefa2f6122cf1cb6171698e6bf2e605d93f052d15371657f5c1901794819ca2c3eded2ec1f
+AUX lirc-0.9.0-kernel-3.5-err-fix.patch 326 SHA256 171f03c8d93e60b86caec6027c303797028f57bc99cd37e6ccb65ef074f5de35 SHA512 c3a6e802b140595155a7ae8dc695bc13e4d6147323949a8dc9c86857bf7abcd442339eac64f99869925c308a100bfb1b7b0eb715f086afb8997252164ff079df WHIRLPOOL aa849092798c5e1335336d4de86139b5c545c8ffa899a92182f9a010e0c1e28d8e3dfca8e3d71bf2aee874c52dd237b8b10f9d514e7dce571b634b6cb1d4bd15
 AUX lircd-0.8.3 581 SHA256 9ba3c5a8c0ca5966729dc5e2c7a5960bbf12b443d91e9e319a0277f153df1b1f SHA512 d0f652df31fa1583232e3b29b5fc95d21fc76564df9f5e54881ee849c7a6fa0d697f15335c2e3f1b8ab0b29b7cddef605bd15073f394c29df9e5704854b0017a WHIRLPOOL 69c23cc6584ec435ce50689df223b27244a8deda351dbf048646f05021eba6893c22be24e167930cbb786f15e79cbfa97cf335de8b311ff9543c0e50a853a503
 AUX lircd-0.8.6 973 SHA256 473cf04b2f6addf7c86d23103b1eff68bf3758fda2bf25401ff0631c568c7805 SHA512 9992b629073d9d9c05388b6063d1a7eff6a47514ccc1af2739638c8375b284cd6252c1a825d172d160acee9983f7bd59fdde6dd282c62597e8d6d7a149f06f69 WHIRLPOOL ccb99a3df8e52f3b6abeddebd727aa734c547fafb3db19b4fd266fc7f69d0b0674f937a21bb11d8d338d59c019d870797715993eb781de1f15f4bef1cfe9927d
 AUX lircd-0.8.6-r2 1317 SHA256 40d1b609e54327d40e0f4314e31ea58aa029bf95f9f27f311da1260fef2fa416 SHA512 c896b229c6b025d4f2cc3684c0905b83e8e6663f11f35fc705636445846f069cbe6ea1b03bd2e7dab136b0d4895ad35b2b940d713caee3204a97bc8c8080c2f3 WHIRLPOOL dda8fdee434778dcefb90778485845e1c7f724e292d6d11c26c5ac951b232b1bc87b75faa236c48bc3ffd4abb68b74bacbb5564173215c8d944906c542eaa232
@@ -20,14 +21,14 @@ AUX modulesd.lirc 482 SHA256 3906b61951e1245cb3c9b16e81255a735f7bcdbbfcbedcdf44c
 DIST lirc-0.8.7.tar.bz2 832187 SHA256 e431454f266c4ddc209c3cc84fc506cac6092eb5124b4f3dcc215c8584ea7a39 SHA512 1ddc054a70949082dd7f8fed98d898da65e586c3fbf1de6751d8371fe693745842396315d3027d9c93e8237bb31d9126be84126c7c232fac19e12b196ef384ce WHIRLPOOL 973a2e5be2328d6866a064739e258bf28b32a503f89d1b1dbfcadd6b9e666513820406bca62d620b5091dcd8d53829f026e73422ed62fdfebafb6594e80e8624
 DIST lirc-0.9.0.tar.bz2 857286 SHA256 6323afae6ad498d4369675f77ec3dbb680fe661bea586aa296e67f2e2daba4ff SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431 WHIRLPOOL 0a1c00b07898aa7a5d78865fb73c6d26c6331dd0a4945773a801d29e40298b365eb58cae113a95fcf73be678a24ac082ad0868e8051303d732882fb82a859a7b
 EBUILD lirc-0.8.7.ebuild 10100 SHA256 4a68073a5039a14358a63b65ef2b8981a178b9369d9bc9548420f8d97153bc8f SHA512 15508d9bdd99e94c5bf5520ceb8a57ca6bdc05ed8cdc3b79307acbb00a03553a21c625a502d242a05da6c9137abe9dd809ac27c905129351ca752c466d2b0bb3 WHIRLPOOL 404b9f37112328044bd4a578052cbf0352fb13e44e4c855260670f978a0d916fa03aa6f4c3a72f18a7569cc767e4ec470b88e030b18e934afe10a894230d8969
-EBUILD lirc-0.9.0-r2.ebuild 12900 SHA256 4ad3ecfee30939a13a370e233464fd5e6d17858e482c30f87120149c7c45492e SHA512 3d3999b1058dde6e4bfa86b542d0d1f107bc4a5716273e5834a381bdf9258996cbcb993b44cbbd92380446e34291ab5fe227bbc56420ed51dcccc8a2581aabd8 WHIRLPOOL bdf28c41a1fba453d4dcaccd83e964cd62b16699147ec2e10faa747e9bf576a5f758718fca02a4ab361ec82fbaede5ce6083852520d9e1cb06e767820915c2f1
+EBUILD lirc-0.9.0-r2.ebuild 13021 SHA256 8acceaa1d7f893b303a1e12ac92e8bed5fa1c1ab74bcc147b77ddc2be47e786a SHA512 38c3e0a1f1c28a0a377ff2e600ebeb7d5f21bdd08e2d14e419faa803a520c4b9e724876dcf6e2b26e3f87acb7629f3c37350732055728dec3c2bfbf85a3c7930 WHIRLPOOL ce31f6cb5e48ee839ccbc79f3e426803694809ff8d7e40ac45149c97b789e0a719c3120f26593694ca6a6f207bb4adaa840fccefb0af83e6221ff3306ef0983e
 EBUILD lirc-0.9.0.ebuild 10161 SHA256 570944822013fd494d91a915e763d74c27870d2488d09b2ace54f4cd4603e0d4 SHA512 ef91477c7840ee3848f6a3da063ba73f62f0017b17a290ca33354e8c7960ca167c5a45edf6a5b3c5d993b09bc14da7884dbe79279d653bcca7a0f923d1f54e7f WHIRLPOOL c03ea9947a658e24ef263de4c40c4b19f014326636d3ffae83eefc04361926d992250587f90f440015b2fb244a79437c8f19967a8fa6f70adf3d364eceafda4d
-MISC ChangeLog 38786 SHA256 1f0dbfc02052bb92ffa914311672ca7b20cfa2f0428870f1230cd49bc0c5bc3b SHA512 971deb48c237a9373a3103b1b82492bacb24918dab25d4c95a8f001a1c8966ef9eb941a232c62cf6e50393c338edd04c90a8ccecb02b212d71c63a16bf5f9743 WHIRLPOOL 1fffa9d2383a312cd044dbb9bfd2669c9ee495934e6cc3648b14bb24847feee125386ad1ae245530cd26fc059ae834e7125d3163a40676b9ae4b4c652a90a2fb
+MISC ChangeLog 39000 SHA256 d8cce4daeb2ef43e623ec352688213b2f7c07d4d71490312982cb96cd1b8d2f7 SHA512 a506d9232b727cb81d9b866f18d73591e672c5f6f81e6ea64bd65d212e5b86cb03e34a1ba235363fecd47507d92d9b5cbcd3cf240f3fb2e542e10ac216543603 WHIRLPOOL 62c9e85633aa7d2e0c92a84feab64b58669836f0c5751f63b44f8e77ebd48c835252c17fe8178bfcf0591d68bbce6c65ad13d0e5c3367b3182eb4b7b0cdfdc88
 MISC metadata.xml 376 SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa SHA512 17eca2da394c7ca359766b80a0bd743f57235e49f422a7c2b1108e7d2dcdd7ea38ba36d8b3e3bc58b3d3818d75af99c0220eefff9d73aea97b561278cc243ce7 WHIRLPOOL 39c1156d377164114fb8730153a9e5e9dd4753ed98aec00fdff779de354336c3f791dd4fde3a0eff2dff3a8e62279f6e1ab473cf5e6cf00902f3febce0e2ac4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCINdMACgkQ2ugaI38ACPA/MQD/QB8WJ2SDV4lVz4cTnZWrWjmF
-q5+WRTK8SPxwII5Tb6EA/3WSdLDh/tYmevrBfxU/Nq0jelHvMQcxpF3mHsj0XAXw
-=FnNI
+iF4EAREIAAYFAlC1C0MACgkQ2ugaI38ACPB+FAEAnJ5X9roXnNgz4gCFRzZpFTWy
+99r1GOleeK/9+ZIijJABAKxplHgvvhG3RSp2o4ZZIa4OQDj/tCYSTL2nvE3e0jWA
+=FI77
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch
new file mode 100644
index 000000000000..b06d94efb322
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch
@@ -0,0 +1,12 @@
+--- a/drivers/kcompat.h	2011-03-25 18:28:18.000000000 -0400
++++ b/drivers/kcompat.h	2012-11-27 13:37:55.000000000 -0500
+@@ -136,4 +136,9 @@
+ )
+ #endif
+ 
++#ifndef err
++#define err(format, arg...)                                     \
++	printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
++#endif
++
+ #endif /* _KCOMPAT_H */
diff --git a/app-misc/lirc/lirc-0.9.0-r2.ebuild b/app-misc/lirc/lirc-0.9.0-r2.ebuild
index 9bcc0eafc881..d4d3fb5da43a 100644
--- a/app-misc/lirc/lirc-0.9.0-r2.ebuild
+++ b/app-misc/lirc/lirc-0.9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.4 2012/10/24 18:39:12 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.5 2012/11/27 18:49:26 axs Exp $
 
 EAPI=4
 
@@ -298,6 +298,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
 	# Apply fixes for kernel-3.3 and above (bug 439538)
 	epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch
+	# Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736)
+	epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch
 
 	# Do not build drivers from the top-level Makefile
 	sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am