apply fix for kernel-3.8 (bug 461532) , only unparallelize the necessary bit of compilation

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

4 files changed, 104 insertions, 8 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index a0bae6c7c60e..39357be74ed5 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/lirc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.240 2013/04/26 06:07:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.241 2013/05/24 16:31:01 axs Exp $
+
+  24 May 2013; Ian Stakenvicius <axs@gentoo.org>
+  +files/lirc-0.9.0-kernel-3.8-fixes.patch, lirc-0.9.0-r2.ebuild:
+  apply fix for kernel-3.8 (bug 461532) , only unparallelize the necessary bit
+  of compilation
 
   26 Apr 2013; Patrick Lauer <patrick@gentoo.org> lirc-0.9.0-r2.ebuild:
   Automake 1.13 fix
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index e2b43b0f39e3..82ea88ea7670 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX irexec-confd 280 SHA256 c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79 SHA512 2b33e1044086d11fd6e1f9a204ce925182a3a2b92ef4399610e01702f9c2c8fbc87cae52961123297171eef3d40468ac17437b4281b26a5f3b256c9cebc612ac WHIRLPOOL ff0e09a0babe7f434252416f3c7d0fb27b95215c62e582c1cd4670130c48c74dcf1e565e4aa7c5705fe39f67922b0abdc28a1938a9288ef3476979bd99609377
 AUX irexec-initd 808 SHA256 9325419aa45d80c205bc1cd47fe839b178da74bca5dd928cbe3ae17423b92493 SHA512 6d9535cfc6469d62f2b09bc5d12ff7c792c279dab6d58d3847625ac995f20945309765c3b9781bd51dbd9d2986465f0b96818c3f4162a689807bf5e3936a4067 WHIRLPOOL be2ef1c89803a6a7c3f533c075a6a60be550d84c9b1812673d79df400305518df2b5329c6726c4aece88cf113dd2db051d1c6d6e5ea7e37e16eb463c38694690
 AUX irexec-initd-0.8.6-r2 816 SHA256 5e5a31fbd93294a6e210499a880fcab371b23706824c9d60d827b0187d7bade4 SHA512 b90226e8dc29ed1769275a010e0b1f5376b91d4f3cfd7bb9dd135bdee31c0f7849f31a885baafe4cbbf9f11b548712e1d78198b44252c779ffeccc5e47730054 WHIRLPOOL 00936357f3df1f63821d7da4f4452ba25a5368d4d128c088e421be2fff2e50d1a190522a9aac6712da2867e827492e674806e5871f797eacf12d333091991f96
@@ -7,6 +10,7 @@ AUX lirc-0.9.0-atiusb_kfifo.patch 437 SHA256 b7950ee185588a3626b8024cb22c0e67c85
 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 lirc-0.9.0-kernel-3.8-fixes.patch 2727 SHA256 82e26f0a41dc259d7ed046d888005772187ad5dfd8440408a42acc56f246d693 SHA512 0db9cbb3aba7d43dc497bc8009afb8335bfe013a06aa6936e1cd357e58c60f545575b06fb6941740d82b496dd4f2ac51b3a165435aee6b3c57107ae62bae7bdc WHIRLPOOL 69d7164ae44146db9aabbaf04376948d94826f1e70e1f957fdd83ec01fa7b30faa3778f16869544fb4e90535a4c2c048e942d3373c5570be3ca3584b5c6f7621
 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
@@ -16,6 +20,13 @@ AUX lircmd 466 SHA256 d47f22a33a83c14a4a0c333d6a445c40e550c491899fb0c6d323e23fe1
 AUX modprobed.lirc 549 SHA256 b4951252321ea326d3ec401e5ff1112716c5aaf5b2ca94d9f5e187e22ad35c44 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63 WHIRLPOOL a45ec8b3cd725f9b4c6b991cf6d4fec7869a07911a2ac82535dca665a0dd99a66b40d85faf0beea780001e9260a8a17c1ccec880c05a271a138c1e0501f7727c
 AUX modulesd.lirc 482 SHA256 3906b61951e1245cb3c9b16e81255a735f7bcdbbfcbedcdf44cd53236e2a3f28 SHA512 07ae7c7288878f65857962bb3a343b83d58eca6447299253dd297dec6443b95d89f46ebcbe1f1ac66ec5062f8134a2e19ecc3ce397b2f8d0d27f203a2a103fcc WHIRLPOOL 2bc4c45d3fd314cc88d50f79974b2aafa4e55a7df7383cbd2f3ddf5b66e144b5700f8d411f79ea458caec0da3e47d5e0db2c34e1efcc2d748c473fe2c5ae7389
 DIST lirc-0.9.0.tar.bz2 857286 SHA256 6323afae6ad498d4369675f77ec3dbb680fe661bea586aa296e67f2e2daba4ff SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431 WHIRLPOOL 0a1c00b07898aa7a5d78865fb73c6d26c6331dd0a4945773a801d29e40298b365eb58cae113a95fcf73be678a24ac082ad0868e8051303d732882fb82a859a7b
-EBUILD lirc-0.9.0-r2.ebuild 13117 SHA256 f9a16034c718b8a660a7e1342c0ef2ff5ff766b2c49ab6ae6709388c13f58d77 SHA512 d9f85c4d702aa9a31f66fc769bccb4066e778ab8362f6d5f81725c7fe8b8e634491c50a3e09361c2a38d9d51a35985077c280aea1c2e6349eea8b9fc3ae9a99a WHIRLPOOL ddd6b9080462095ab6c3ee6d464f998543636b4f3854ab9be7421a6d16b283a6e9dfdd2cf0985e54788ad2c9beaaf4ecc6ca0841641c26210734e30e0a4e8f4e
-MISC ChangeLog 39595 SHA256 fbbe7897dfaccafdc3a18abd550116b8d7d123a3cc922e6a7a5b6d7466c73cd7 SHA512 31fe80fa9d4a8eacee0b8b66126c82bcb2b6451dd66fcc36332c2cd7984004b1772144c13aaa18e84076900c765e3f702e6acfe6439f60c604df860717dac146 WHIRLPOOL 8c19d512e81e9122146803872e0de1fdb835ac9ede531d500d1fda8641046394086af25c809e6c2cc103614e8dbada60a83a993c3d01c32d3fddfe3ccd9bdef6
+EBUILD lirc-0.9.0-r2.ebuild 13219 SHA256 419dacad5dc92fe968e77dd5edb9fd73bdab0b59efb266ad301203bb071088bc SHA512 b0dbb78d12e61b2648563b24586e3d0e777ffd1b8179d6865d2d4038942dae95478b2beee50edbb86de9187097ef05495fb8e0d4494912bc815672882d971971 WHIRLPOOL 84625e8c0ad16516869905da1429c98156ceb85a2688fe0a5d0221d7b3ddfeaef10a6eedd67f7e7a7c9136e7c968a84387a09911860da8fadf8c383ff46d0b36
+MISC ChangeLog 39803 SHA256 9426914d9b6d072de4983c5f08133caea7763ed959f256e9bcae39c863ed3f06 SHA512 b6e1273b8e2299ea9b9b895da622b730612495424259db8031325e7b4b0f6703d26b93e7eed2a1e963a9bbd053033ce8ee0c7901d9765d221d1df7959bf2a402 WHIRLPOOL 3c6b5ded3b1345862d31a60baba2584e2d7989f71199baa693f695be4ece0f52d3e7f44fd4ed720dbed8381971c36b7a552cb1c445666d14761124a328bed6d8
 MISC metadata.xml 376 SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa SHA512 17eca2da394c7ca359766b80a0bd743f57235e49f422a7c2b1108e7d2dcdd7ea38ba36d8b3e3bc58b3d3818d75af99c0220eefff9d73aea97b561278cc243ce7 WHIRLPOOL 39c1156d377164114fb8730153a9e5e9dd4753ed98aec00fdff779de354336c3f791dd4fde3a0eff2dff3a8e62279f6e1ab473cf5e6cf00902f3febce0e2ac4f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlGflc8ACgkQ2ugaI38ACPAi5wD8CEma09ehQQW/qnEggxLlturr
+RaeUXjeyqvAWu4BsPSsA/ixJeoh+sC8/FT6J6XOJ4oCNw8LR95fyaQl4SBOdMMZ1
+=NHB+
+-----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch
new file mode 100644
index 000000000000..bd11b61c19d8
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch
@@ -0,0 +1,80 @@
+diff -Naur lirc-0.9.0/drivers/lirc_serial/lirc_serial.c lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c
+--- lirc-0.9.0/drivers/lirc_serial/lirc_serial.c	2013-05-24 11:58:31.017566567 -0400
++++ lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c	2013-05-24 12:00:38.733568898 -0400
+@@ -1107,12 +1107,12 @@
+ 
+ static struct platform_device *lirc_serial_dev;
+ 
+-static int __devinit lirc_serial_probe(struct platform_device *dev)
++static int lirc_serial_probe(struct platform_device *dev) 
+ {
+ 	return 0;
+ }
+ 
+-static int __devexit lirc_serial_remove(struct platform_device *dev)
++static int lirc_serial_remove(struct platform_device *dev) 
+ {
+ 	return 0;
+ }
+@@ -1163,7 +1163,7 @@
+ 
+ static struct platform_driver lirc_serial_driver = {
+ 	.probe		= lirc_serial_probe,
+-	.remove		= __devexit_p(lirc_serial_remove),
++	.remove      = lirc_serial_remove, 
+ 	.suspend	= lirc_serial_suspend,
+ 	.resume		= lirc_serial_resume,
+ 	.driver		= {
+diff -Naur lirc-0.9.0/drivers/lirc_sir/lirc_sir.c lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c
+--- lirc-0.9.0/drivers/lirc_sir/lirc_sir.c	2013-05-24 11:58:31.017566567 -0400
++++ lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c	2013-05-24 12:00:38.733568898 -0400
+@@ -1296,19 +1296,19 @@
+ 	return 0;
+ }
+ 
+-static int __devinit lirc_sir_probe(struct platform_device *dev)
++static int lirc_sir_probe(struct platform_device *dev) 
+ {
+ 	return 0;
+ }
+ 
+-static int __devexit lirc_sir_remove(struct platform_device *dev)
++static int lirc_sir_remove(struct platform_device *dev) 
+ {
+ 	return 0;
+ }
+ 
+ static struct platform_driver lirc_sir_driver = {
+ 	.probe		= lirc_sir_probe,
+-	.remove		= __devexit_p(lirc_sir_remove),
++	.remove      = lirc_sir_remove, 
+ 	.driver		=	{
+ 		.name	= "lirc_sir",
+ 		.owner	= THIS_MODULE,
+diff -Naur lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+--- lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-05-24 11:58:30.974566567 -0400
++++ lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c	2013-05-24 12:00:38.734568898 -0400
+@@ -942,12 +942,12 @@
+ #ifdef MODULE
+ static struct platform_device *lirc_wpc8769l_platform_dev;
+ 
+-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
++static int lirc_wpc8769l_probe(struct platform_device *dev) 
+ {
+ 	return 0;
+ }
+ 
+-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
++static int lirc_wpc8769l_remove(struct platform_device *dev) 
+ {
+ 	return 0;
+ }
+@@ -975,7 +975,7 @@
+ 
+ static struct platform_driver lirc_wpc8769l_platform_driver = {
+ 	.probe		= lirc_wpc8769l_probe,
+-	.remove		= __devexit_p(lirc_wpc8769l_remove),
++	.remove      = lirc_wpc8769l_remove, 
+ 	.suspend	= lirc_wpc8769l_suspend,
+ 	.resume		= lirc_wpc8769l_resume,
+ 	.driver		= {
diff --git a/app-misc/lirc/lirc-0.9.0-r2.ebuild b/app-misc/lirc/lirc-0.9.0-r2.ebuild
index ef28c1a1ffa2..bf56eefe91da 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-2013 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.10 2013/04/26 06:07:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.11 2013/05/24 16:31:01 axs Exp $
 
 EAPI=4
 
@@ -278,9 +278,6 @@ pkg_setup() {
 	elog  "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}"
 
 	filter-flags -Wl,-O1
-
-	# force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
-	MAKEOPTS="${MAKEOPTS} -j1"
 }
 
 src_prepare() {
@@ -300,6 +297,8 @@ src_prepare() {
 	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
+	# Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532)
+	epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch
 
 	# Do not build drivers from the top-level Makefile
 	sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am
@@ -345,7 +344,8 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	# force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
+	emake -j1
 
 	MODULE_NAMES="lirc(misc:${S}/drivers)"
 	BUILD_TARGETS="all"