Fix building on sparc #217068 by David Dolbel.

Package-Manager: portage-2.2_pre5

4 files changed, 28 insertions, 7 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 253a83f13c60..cbc8c84e34a3 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/kbd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.72 2008/04/01 15:16:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.73 2008/04/10 03:33:53 vapier Exp $
+
+  10 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/kbd-1.14.1-no-asm-kbio.patch, kbd-1.14.1-r1.ebuild:
+  Fix building on sparc #217068 by David Dolbel.
 
 *kbd-1.14.1-r1 (01 Apr 2008)
 
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index c1964689e142..a4f87c01b4b1 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -17,19 +17,20 @@ AUX kbd-1.12-unimap.patch 642 RMD160 a8ae481be1e2ca64a2ddc73f03fda644436f76a2 SH
 AUX kbd-1.12-xcompile.patch 680 RMD160 a2db9ef656d9a09aec4ebd5d02726efa7e3d4818 SHA1 7c4c6b08f0f0c443a309a86055b01c11d8e80c21 SHA256 78d29c76075cf5ee347461e28ae0ac25a06ce446151d91ec661c3a2d33da4191
 AUX kbd-1.13-dont-use-error.patch 414 RMD160 76e822064fedc9f5b36daf10c06c83f13afc1f13 SHA1 543874d0f36ace327af79815004b1cd017ce9357 SHA256 9f9e7e860362b7e5402c1c0af55ff301e0542e34aacc71167f9252f50a4f74ca
 AUX kbd-1.14.1-missing-configure.patch 444 RMD160 d1d4f185e8d761d865a3f64fb717446505e08c30 SHA1 ea03ca92b21c0d5a87db2e31f1fd27c1c2e4394b SHA256 0a2a530ac1d2baa03c7cc12e10a242bbc9d128304136f5dba4909d3df2b16eb1
+AUX kbd-1.14.1-no-asm-kbio.patch 208 RMD160 62c584cf8f4f6af923f2608036f2db826ad45f72 SHA1 6d98a4e82018df92d9442bd563665cba606fe82b SHA256 720e8be37b9b0109b8f3bbe92ea210ac4710cf012b551ce5482f60e2ae8d9d0d
 DIST kbd-1.12.tar.gz 884827 RMD160 260ed9b79b5a679730fc16f1d3ce9360f4ad63fd SHA1 d4917da308e01e74d67d7b814bf527063b3919fc SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803
 DIST kbd-1.13.tar.bz2 667373 RMD160 a3d34185d86b532f2cdc8d0834ad5459625b8538 SHA1 76ef90c65d5bb7b401e1f657eb443b9b1d4def5d SHA256 c8a5be1a606d925c3229fa91d3e9dde4e0b61b2c755aff8e699b855f1a402bf6
 DIST kbd-1.14.1.tar.gz 1010836 RMD160 5206423c9950c8beb2467e7b761d2a0f827ebbe2 SHA1 12d91613096d1a724fc780e2d7974a0a1b308dce SHA256 e97ed7ec4ec937a27ac2e72789e76db4b661f7ce2c2b7b68524f55ee69dce491
 DIST svorakln.tar.gz 3030 RMD160 4ee5d1bdab312eb33cbde9195e6d4cdf28eb9a6e SHA1 a529a5fa4968b135996aefc7c2e4f38e8dc7d827 SHA256 7c4015dcd1f4310ba1b872c9a9e57c43d45da822330853ae465e628d3bca8ee3
 EBUILD kbd-1.12-r8.ebuild 3143 RMD160 ad03c088614ea20e931e9162abf9facc75d05b31 SHA1 3317d7e4edcbf7292222a0b3c035d2d53a547afd SHA256 5d156358c645cdfee4b7671f52ce5da7fd15da2c2a65284e6a43d68b40b0a839
 EBUILD kbd-1.13-r1.ebuild 2093 RMD160 2151b5917afcfa8c1460bf7256b49c8019e94e47 SHA1 0fce10d63fc9cfb5012cd648854b3571e1d1a368 SHA256 c5004380976335b07e9a0b5948814b58e29cad32a18778b7ebff8ba30b760faf
-EBUILD kbd-1.14.1-r1.ebuild 1254 RMD160 4b036e9aee73090f11c344c3391161610230a2f7 SHA1 b05d2ef974eac944d5cd9ff1bf44fc0fab912b6e SHA256 d7687eb32f45543d803a3595a35bd280b08533424c93f79c77a49754c2c8bd70
-MISC ChangeLog 11057 RMD160 f045ef3976ed9245a23b0b09312ae58bf0413121 SHA1 791343d08cc98ac470bd303ca2f9290e6fd4b35e SHA256 d925ba9bfa1c51dfb5ec58c8690600034bd8338176bc6cb82f8d7e7bf2da6788
+EBUILD kbd-1.14.1-r1.ebuild 1307 RMD160 253fbfbd77aa456e5f21f9c9467b2201a63dd019 SHA1 81ec53a3e4c984b4233f0162a64bef5751acc346 SHA256 c4021a3be2ad7f3063d74840fa6aca83feaee5ec98610c621e9a58d8d10ed8cd
+MISC ChangeLog 11218 RMD160 320d617f422d5413e13a9eca2a436e8aecf2f7a4 SHA1 5cd2ac2fb40d02f5e412567544766e01f0a83cb4 SHA256 c319bb241882e970b9e11ceb030b3d51fd2082c32b6702ab137f31eca6521c50
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH8lKmj9hvisErhMIRAlU8AKCS7lvUvkwqv3fdVgXmP731cd7qBQCeJ3qI
-HwRp9q8ksobW6vEivJFV4bw=
-=FgO5
+iD8DBQFH/Yqnj9hvisErhMIRAvH/AKDqyCgYvkCL8s++D9pL8x/rB1FO+wCgrlo+
+HW+2e1aAHw6n5yOOMWV0eJw=
+=tyWF
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kbd/files/kbd-1.14.1-no-asm-kbio.patch b/sys-apps/kbd/files/kbd-1.14.1-no-asm-kbio.patch
new file mode 100644
index 000000000000..1dd62925d2fa
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.14.1-no-asm-kbio.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/217068
+
+--- src/setleds.c
++++ src/setleds.c
+@@ -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.14.1-r1.ebuild b/sys-apps/kbd/kbd-1.14.1-r1.ebuild
index 7cdc00f291ff..fb6b9a78b6c9 100644
--- a/sys-apps/kbd/kbd-1.14.1-r1.ebuild
+++ b/sys-apps/kbd/kbd-1.14.1-r1.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/sys-apps/kbd/kbd-1.14.1-r1.ebuild,v 1.1 2008/04/01 15:16:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.14.1-r1.ebuild,v 1.2 2008/04/10 03:33:53 vapier Exp $
 
 inherit eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.12-jp-escape.patch
 
 	epatch "${FILESDIR}"/${P}-missing-configure.patch #215610
+	epatch "${FILESDIR}"/${P}-no-asm-kbio.patch #217068
 }
 
 src_compile() {