cross-compile fixes

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 853cefec83fb376983b9e683c9e0cf2eb7340885..c0d5794027cca8275b83d6f32b36f9e57fad175e 100644 (file)
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 MD5 10cd4cf8b9787c24ddfcc43de8a231d6 ChangeLog 5980
-MD5 d874b9fa0ea62dbc8cf550e6e62c6de0 kbd-1.12-r3.ebuild 2210
+MD5 a09b94a6510f9f5f2080dbd33a8c30e2 kbd-1.12-r3.ebuild 2210
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 b392b9b6ce5edd6e37767cecb3d97187 kbd-1.12-r2.ebuild 1891
 MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r3 118
@@ -15,7 +15,7 @@ MD5 3492e6d5769a7bcb8d19dddf46f3a08e files/kbd-1.12-kbd_repeat-v2.patch 756
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBfeTQHTu7gpaalycRAtteAJ9PLbmSZCJeELqeS2xXQvmgNlNbGgCbB4Qd
-21V5nUCDH1FRO4P+N6laf2U=
-=jnrk
+iD8DBQFBtk+HroRuSHgZdywRAn2eAKCT9fY67e4TC76gFPHNTVdjVXmVWACfS9QN
+o9APURwCtVAKt+5Zk27MxlI=
+=pYDE
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/kbd/kbd-1.12-r3.ebuild b/sys-apps/kbd/kbd-1.12-r3.ebuild
index 69ac3f05afbc25213af4be34c45fa99b828d9f61..e323da840dc3a30924c0a499f61052cadcbf5f04 100644 (file)
--- a/sys-apps/kbd/kbd-1.12-r3.ebuild
+++ b/sys-apps/kbd/kbd-1.12-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r3.ebuild,v 1.1 2004/10/26 01:46:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r3.ebuild,v 1.2 2004/12/08 00:49:01 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Keyboard and console utilities"
 HOMEPAGE="http://freshmeat.net/projects/kbd/"
@@ -28,8 +28,10 @@ src_unpack() {
        done
 
        cd ${S}
-       # Fixes makefile so that it uses the CFLAGS from portage (bug #21320).
-       sed -i -e "s:-O2:${CFLAGS}:g" src/Makefile.in
+       sed -i \
+               -e "s:-O2:${CFLAGS}:g" \
+               -e 's:install -s:install:' \
+               src/Makefile.in
 
        # Other patches from RH
        epatch ${FILESDIR}/${PN}-1.08-terminal.patch
@@ -60,7 +62,7 @@ src_compile() {
                --datadir=/usr/share \
                ${myconf} || die
 
-       emake || die "emake failed"
+       emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {