Build fix: sparc newer linux-headers lack asm/kbio

Package-Manager: portage-2.1.1

4 files changed, 56 insertions, 10 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index d2b564f9868d..e99fef71a28e 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/kbd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.53 2006/10/14 20:29:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.54 2006/10/23 15:19:25 gustavoz Exp $
+
+  23 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  +files/kbd-1.12-kbio.patch, kbd-1.12-r8.ebuild:
+  Build fix: sparc newer linux-headers lack asm/kbio
 
   14 Oct 2006; Aron Griffis <agriffis@gentoo.org> kbd-1.12-r7.ebuild:
   Mark 1.12-r7 stable on ia64
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index b13f07ec8717..f1fb6cba6772 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kbd-1.08-terminal.patch 925 RMD160 0f622bcf874c01ee6533cfbdc6137e4f8949299b SHA1 e4a473ce98292a77403a9d79b8cdc083542113ec SHA256 466ac92951695017498c640547af9aeb6351b2da75b6b787c7d0f17f409e9134
 MD5 6e007f04a80358ea81b27c80498a4808 files/kbd-1.08-terminal.patch 925
 RMD160 0f622bcf874c01ee6533cfbdc6137e4f8949299b files/kbd-1.08-terminal.patch 925
@@ -38,6 +41,10 @@ AUX kbd-1.12-kbd_repeat-v2.patch 809 RMD160 48d058cd7cfcff6df450e21138f28ed8ead1
 MD5 5f28051ad309ee4e481ef3b2b9cc9714 files/kbd-1.12-kbd_repeat-v2.patch 809
 RMD160 48d058cd7cfcff6df450e21138f28ed8ead1cdca files/kbd-1.12-kbd_repeat-v2.patch 809
 SHA256 7b64a4d2a59f28e4f19405bbc81bedd7774f812f1831cb2c0afe217799d7c165 files/kbd-1.12-kbd_repeat-v2.patch 809
+AUX kbd-1.12-kbio.patch 648 RMD160 a1351e1d3691bc86cd8f5ad74c0b0a2d2e5da5d8 SHA1 64f1bcabd93d34dfaedc5b0f566f8cfd0decaf11 SHA256 822d7fb35a7d2f730e4272284368a44a055f850bf98005bf5d69e5e116bb417f
+MD5 d6adce4794ca6a239b6abfe365126512 files/kbd-1.12-kbio.patch 648
+RMD160 a1351e1d3691bc86cd8f5ad74c0b0a2d2e5da5d8 files/kbd-1.12-kbio.patch 648
+SHA256 822d7fb35a7d2f730e4272284368a44a055f850bf98005bf5d69e5e116bb417f files/kbd-1.12-kbio.patch 648
 AUX kbd-1.12-setfont-man.patch 629 RMD160 dba23dfb4a9d263da6bc094a56366371bfc1b9d2 SHA1 61f3e19290ec3d85838158b2efbbf60be21e88af SHA256 f81c6f07bddefe8bf1f8e1102f8a8c72e96f632aefa248e71a594ad19d767770
 MD5 ff84eec635b7a1578ef1284b994f779b files/kbd-1.12-setfont-man.patch 629
 RMD160 dba23dfb4a9d263da6bc094a56366371bfc1b9d2 files/kbd-1.12-setfont-man.patch 629
@@ -60,14 +67,14 @@ EBUILD kbd-1.12-r7.ebuild 2979 RMD160 5c5aab9957f05774211acdd7870c6c49d831c705 S
 MD5 0266d70addedd8311353c40139e8b8db kbd-1.12-r7.ebuild 2979
 RMD160 5c5aab9957f05774211acdd7870c6c49d831c705 kbd-1.12-r7.ebuild 2979
 SHA256 337662a09e0a1dd406310fb2aad2743d9a5a83536d418e4e5ca486b756936c4b kbd-1.12-r7.ebuild 2979
-EBUILD kbd-1.12-r8.ebuild 3079 RMD160 24936269682f315a20e8bd19f8f4ad67ca4e22fb SHA1 fa4cda957a0fa441f7735b8a2b898960feb5810e SHA256 cc2186ab3a1662129c9852bf366519b50af7ebcf0a2f20422a3bc08955251c42
-MD5 ad227577ecf61627325d8e61615041f7 kbd-1.12-r8.ebuild 3079
-RMD160 24936269682f315a20e8bd19f8f4ad67ca4e22fb kbd-1.12-r8.ebuild 3079
-SHA256 cc2186ab3a1662129c9852bf366519b50af7ebcf0a2f20422a3bc08955251c42 kbd-1.12-r8.ebuild 3079
-MISC ChangeLog 8733 RMD160 aff3bbb706ac38a986ec47d82f2dc24bcfaaa9ab SHA1 d01f563887403cfb0e1c9af34b45b669e7629c14 SHA256 706c17cf71b6fec72a40959e81ffd3c03c7b9335748e598d38857c2e3a51dc8c
-MD5 818cb1ab46b422a2f4831482e2ab863a ChangeLog 8733
-RMD160 aff3bbb706ac38a986ec47d82f2dc24bcfaaa9ab ChangeLog 8733
-SHA256 706c17cf71b6fec72a40959e81ffd3c03c7b9335748e598d38857c2e3a51dc8c ChangeLog 8733
+EBUILD kbd-1.12-r8.ebuild 3157 RMD160 d4facd18e24f547a552ef327a268ee1599676cfc SHA1 daa744beb88a61e1e870e65ad165c7a76e7a6b71 SHA256 eb2ac6307bf46fc855525c64da4f8f3ca9cfa91f211a7f5245804a032954e95b
+MD5 909bc8b833e268d5ae1e814a35ae4b02 kbd-1.12-r8.ebuild 3157
+RMD160 d4facd18e24f547a552ef327a268ee1599676cfc kbd-1.12-r8.ebuild 3157
+SHA256 eb2ac6307bf46fc855525c64da4f8f3ca9cfa91f211a7f5245804a032954e95b kbd-1.12-r8.ebuild 3157
+MISC ChangeLog 8891 RMD160 5f9b628e640e071e4fb0be72d603f1326d8f5322 SHA1 c7ccac36f277e233d455c77d1c6775b4fa92e3f9 SHA256 4c20f8d29e86e434cfd6379e7095c4f4902a5c093a9191bc1dbfac23a2cedd13
+MD5 53aee2f84a81c838d16e2aeeb8ac63f1 ChangeLog 8891
+RMD160 5f9b628e640e071e4fb0be72d603f1326d8f5322 ChangeLog 8891
+SHA256 4c20f8d29e86e434cfd6379e7095c4f4902a5c093a9191bc1dbfac23a2cedd13 ChangeLog 8891
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -81,3 +88,10 @@ SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/di
 MD5 ec4cf1768e4c3664ae99adcd221bf6a2 files/digest-kbd-1.12-r8 446
 RMD160 86795682ee0121c2612eb316b4e9ece5bc011889 files/digest-kbd-1.12-r8 446
 SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/digest-kbd-1.12-r8 446
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFPN2MKRy60XGEcJIRAh7BAJoD9mGATikfXC9lLHTHfv+Hj+0/2wCcCTBx
+pRzm0tb4gB0ZHhPWN//Yh/g=
+=Sswy
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/kbd/files/kbd-1.12-kbio.patch b/sys-apps/kbd/files/kbd-1.12-kbio.patch
new file mode 100644
index 000000000000..b2a80d9a3437
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-kbio.patch
@@ -0,0 +1,25 @@
+diff -Nura kbd-1.12/src/kbdrate.c kbd-1.12.nokbio/src/kbdrate.c
+--- kbd-1.12/src/kbdrate.c	2004-01-16 16:45:31.000000000 -0300
++++ kbd-1.12.nokbio/src/kbdrate.c	2006-10-23 11:30:11.000000000 -0300
+@@ -77,7 +77,6 @@
+ 
+ #ifdef __sparc__
+ #include <asm/param.h>
+-#include <asm/kbio.h>
+ #endif
+ 
+ #ifndef KDKBDREP
+diff -Nura kbd-1.12/src/setleds.c kbd-1.12.nokbio/src/setleds.c
+--- kbd-1.12/src/setleds.c	2004-01-16 16:45:31.000000000 -0300
++++ kbd-1.12.nokbio/src/setleds.c	2006-10-23 11:30:20.000000000 -0300
+@@ -14,10 +14,6 @@
+ #include "nls.h"
+ #include "version.h"
+ 
+-#ifdef __sparc__
+-#include <asm/kbio.h>
+-#endif
+-
+ static void
+ usage(void)
+ {
diff --git a/sys-apps/kbd/kbd-1.12-r8.ebuild b/sys-apps/kbd/kbd-1.12-r8.ebuild
index 7ca69f3a8e51..10a13c592b18 100644
--- a/sys-apps/kbd/kbd-1.12-r8.ebuild
+++ b/sys-apps/kbd/kbd-1.12-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r8.ebuild,v 1.1 2006/08/24 13:57:25 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r8.ebuild,v 1.2 2006/10/23 15:19:25 gustavoz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -76,6 +76,9 @@ src_unpack() {
 
 	# cross-compile fails for powerpc targets bug #133856
 	epatch "${FILESDIR}"/${P}-xcompile.patch
+
+	# sparc newer headers lack asm/kbio.h
+	epatch "${FILESDIR}"/${P}-kbio.patch
 }
 
 src_compile() {