- fix cross-compile failing for powerpc targets bug #133856

Package-Manager: portage-2.1.1_pre1-r2

7 files changed, 169 insertions, 23 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 00053ee107c4..0fae5a2c7553 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2006/06/10 19:47:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.45 2006/06/28 15:15:47 solar Exp $
+
+*kbd-1.12-r7 (28 Jun 2006)
+
+  28 Jun 2006; <solar@gentoo.org> +files/kbd-1.12-xcompile.patch,
+  +kbd-1.12-r7.ebuild:
+  - fix  cross-compile failing for powerpc targets bug #133856
 
   10 Jun 2006; Mike Frysinger <vapier@gentoo.org>
   +files/kbd-1.12-configure-LANG.patch, kbd-1.12-r6.ebuild:
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 80d6e546d531..12f516204fa9 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,6 +1,3 @@
------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
@@ -45,8 +42,12 @@ AUX kbd-1.12-setfont-man.patch 629 RMD160 dba23dfb4a9d263da6bc094a56366371bfc1b9
 MD5 ff84eec635b7a1578ef1284b994f779b files/kbd-1.12-setfont-man.patch 629
 RMD160 dba23dfb4a9d263da6bc094a56366371bfc1b9d2 files/kbd-1.12-setfont-man.patch 629
 SHA256 f81c6f07bddefe8bf1f8e1102f8a8c72e96f632aefa248e71a594ad19d767770 files/kbd-1.12-setfont-man.patch 629
-DIST kbd-1.12.tar.gz 884827
-DIST svorakln.tar.gz 3030
+AUX kbd-1.12-xcompile.patch 611 RMD160 c5f343cb4572048c8c1454b1dd972275b22d61d8 SHA1 b095898a2b57d4dd8f9a5926ca7c738ba4f1a4ae SHA256 7e60332adb2d01e9fed335c81bda789444da5a01ca928b759e5a1becde63dbc8
+MD5 8e339f8d8608e3ff38156007e44fa104 files/kbd-1.12-xcompile.patch 611
+RMD160 c5f343cb4572048c8c1454b1dd972275b22d61d8 files/kbd-1.12-xcompile.patch 611
+SHA256 7e60332adb2d01e9fed335c81bda789444da5a01ca928b759e5a1becde63dbc8 files/kbd-1.12-xcompile.patch 611
+DIST kbd-1.12.tar.gz 884827 RMD160 260ed9b79b5a679730fc16f1d3ce9360f4ad63fd SHA1 d4917da308e01e74d67d7b814bf527063b3919fc SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803
+DIST svorakln.tar.gz 3030 RMD160 4ee5d1bdab312eb33cbde9195e6d4cdf28eb9a6e SHA1 a529a5fa4968b135996aefc7c2e4f38e8dc7d827 SHA256 7c4015dcd1f4310ba1b872c9a9e57c43d45da822330853ae465e628d3bca8ee3
 EBUILD kbd-1.12-r5.ebuild 2920 RMD160 4117c6aeaa0c53a59e71bfd047255ecf72bf806e SHA1 1e22bf4bce5ddb3b1022877e74df60c0a823782d SHA256 adabdcebace465fa6095b1ba986728e5e89e9a311dc4328e3dd1af9d82ec48f2
 MD5 6604688276e7452fd5132a1900e65542 kbd-1.12-r5.ebuild 2920
 RMD160 4117c6aeaa0c53a59e71bfd047255ecf72bf806e kbd-1.12-r5.ebuild 2920
@@ -55,24 +56,24 @@ EBUILD kbd-1.12-r6.ebuild 2877 RMD160 4e0c0a6cb7b7141e2fd2959a9edda56bb9d83148 S
 MD5 d69e4bec27cfe95b1c542dff5644305f kbd-1.12-r6.ebuild 2877
 RMD160 4e0c0a6cb7b7141e2fd2959a9edda56bb9d83148 kbd-1.12-r6.ebuild 2877
 SHA256 ca3e7330bad4932999b105abbe46c0fe3a7791002ecd9745e8fd595fda1ae0d3 kbd-1.12-r6.ebuild 2877
-MISC ChangeLog 7643 RMD160 1cfb4ef6da17e0af8e655274552e9fdaa108af73 SHA1 b7a243ec2ec8c652d4e561b7e08f2a9f41ce66d6 SHA256 5b8fd80d364135c656584d9b3764597ef5d6f2945fe2716e756b2303423890d7
-MD5 4eb748c1a89ef190babcf69222918dea ChangeLog 7643
-RMD160 1cfb4ef6da17e0af8e655274552e9fdaa108af73 ChangeLog 7643
-SHA256 5b8fd80d364135c656584d9b3764597ef5d6f2945fe2716e756b2303423890d7 ChangeLog 7643
+EBUILD kbd-1.12-r7.ebuild 2987 RMD160 9551f48acd8aa9a2e60d5037b894ac4118039c17 SHA1 5954d1adc39c0e5b678b232d08b3ae6f44a9c26c SHA256 75bfabf8b80fdcef9f39ebac369f2e617652e617f5137291c42c0e25b3131fd3
+MD5 cc718d678cde7e0dc0df534262978af4 kbd-1.12-r7.ebuild 2987
+RMD160 9551f48acd8aa9a2e60d5037b894ac4118039c17 kbd-1.12-r7.ebuild 2987
+SHA256 75bfabf8b80fdcef9f39ebac369f2e617652e617f5137291c42c0e25b3131fd3 kbd-1.12-r7.ebuild 2987
+MISC ChangeLog 7823 RMD160 f79b1d516d7815f448105bf486a99dbc584f58b8 SHA1 99945b01076785d6c964338bfedfdb3a9891e51f SHA256 a4dfaeb09931d4628bceb782d2a39ff966ec0c8b3a17f6ed5f134a3ff8162c31
+MD5 035ad40a9d776f54a82a12bb1296be55 ChangeLog 7823
+RMD160 f79b1d516d7815f448105bf486a99dbc584f58b8 ChangeLog 7823
+SHA256 a4dfaeb09931d4628bceb782d2a39ff966ec0c8b3a17f6ed5f134a3ff8162c31 ChangeLog 7823
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r5 118
-RMD160 a844cd58706f8008192def9da9f998b7d960f930 files/digest-kbd-1.12-r5 118
-SHA256 75f6cdbc7a856186290a04380b2d2931589d7dd69430c2d2c8a5826688385d96 files/digest-kbd-1.12-r5 118
-MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r6 118
-RMD160 a844cd58706f8008192def9da9f998b7d960f930 files/digest-kbd-1.12-r6 118
-SHA256 75f6cdbc7a856186290a04380b2d2931589d7dd69430c2d2c8a5826688385d96 files/digest-kbd-1.12-r6 118
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEiyLM2+ySkm8kpY0RAllTAKCxWdr4+DM18EvZBU5xKlI0nUdgXQCggcc2
-eXzNMwFyw204Vbpv3AlL0W4=
-=Slxh
------END PGP SIGNATURE-----
+MD5 ec4cf1768e4c3664ae99adcd221bf6a2 files/digest-kbd-1.12-r5 446
+RMD160 86795682ee0121c2612eb316b4e9ece5bc011889 files/digest-kbd-1.12-r5 446
+SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/digest-kbd-1.12-r5 446
+MD5 ec4cf1768e4c3664ae99adcd221bf6a2 files/digest-kbd-1.12-r6 446
+RMD160 86795682ee0121c2612eb316b4e9ece5bc011889 files/digest-kbd-1.12-r6 446
+SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/digest-kbd-1.12-r6 446
+MD5 ec4cf1768e4c3664ae99adcd221bf6a2 files/digest-kbd-1.12-r7 446
+RMD160 86795682ee0121c2612eb316b4e9ece5bc011889 files/digest-kbd-1.12-r7 446
+SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/digest-kbd-1.12-r7 446
diff --git a/sys-apps/kbd/files/digest-kbd-1.12-r5 b/sys-apps/kbd/files/digest-kbd-1.12-r5
index 97dbb48e0136..7bbb85a86bcb 100644
--- a/sys-apps/kbd/files/digest-kbd-1.12-r5
+++ b/sys-apps/kbd/files/digest-kbd-1.12-r5
@@ -1,2 +1,6 @@
 MD5 7892c7010512a9bc6697a295c921da25 kbd-1.12.tar.gz 884827
+RMD160 260ed9b79b5a679730fc16f1d3ce9360f4ad63fd kbd-1.12.tar.gz 884827
+SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803 kbd-1.12.tar.gz 884827
 MD5 c3bc810b784880c9bb5a6fe80d95a696 svorakln.tar.gz 3030
+RMD160 4ee5d1bdab312eb33cbde9195e6d4cdf28eb9a6e svorakln.tar.gz 3030
+SHA256 7c4015dcd1f4310ba1b872c9a9e57c43d45da822330853ae465e628d3bca8ee3 svorakln.tar.gz 3030
diff --git a/sys-apps/kbd/files/digest-kbd-1.12-r6 b/sys-apps/kbd/files/digest-kbd-1.12-r6
index 97dbb48e0136..7bbb85a86bcb 100644
--- a/sys-apps/kbd/files/digest-kbd-1.12-r6
+++ b/sys-apps/kbd/files/digest-kbd-1.12-r6
@@ -1,2 +1,6 @@
 MD5 7892c7010512a9bc6697a295c921da25 kbd-1.12.tar.gz 884827
+RMD160 260ed9b79b5a679730fc16f1d3ce9360f4ad63fd kbd-1.12.tar.gz 884827
+SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803 kbd-1.12.tar.gz 884827
 MD5 c3bc810b784880c9bb5a6fe80d95a696 svorakln.tar.gz 3030
+RMD160 4ee5d1bdab312eb33cbde9195e6d4cdf28eb9a6e svorakln.tar.gz 3030
+SHA256 7c4015dcd1f4310ba1b872c9a9e57c43d45da822330853ae465e628d3bca8ee3 svorakln.tar.gz 3030
diff --git a/sys-apps/kbd/files/digest-kbd-1.12-r7 b/sys-apps/kbd/files/digest-kbd-1.12-r7
new file mode 100644
index 000000000000..7bbb85a86bcb
--- /dev/null
+++ b/sys-apps/kbd/files/digest-kbd-1.12-r7
@@ -0,0 +1,6 @@
+MD5 7892c7010512a9bc6697a295c921da25 kbd-1.12.tar.gz 884827
+RMD160 260ed9b79b5a679730fc16f1d3ce9360f4ad63fd kbd-1.12.tar.gz 884827
+SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803 kbd-1.12.tar.gz 884827
+MD5 c3bc810b784880c9bb5a6fe80d95a696 svorakln.tar.gz 3030
+RMD160 4ee5d1bdab312eb33cbde9195e6d4cdf28eb9a6e svorakln.tar.gz 3030
+SHA256 7c4015dcd1f4310ba1b872c9a9e57c43d45da822330853ae465e628d3bca8ee3 svorakln.tar.gz 3030
diff --git a/sys-apps/kbd/files/kbd-1.12-xcompile.patch b/sys-apps/kbd/files/kbd-1.12-xcompile.patch
new file mode 100644
index 000000000000..d5d50bf365ef
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-xcompile.patch
@@ -0,0 +1,18 @@
+--- configure	2004-01-03 08:53:39.000000000 -0600
++++ configure	2006-06-04 23:50:41.000000000 -0500
+@@ -129,8 +129,13 @@
+ #
+ # 0. Figure out architecture (one of i386, alpha, sparc, arm, m68k, mips)
+ #
+-ARCH=`uname -m | sed s/i.86/i386/`
+-echo "ARCH=$ARCH" >> make_include
++HOST_ARCH=`uname -m`
++TARGET_ARCH=`$CC -dumpmachine | awk -F- '{print $1}'`
++# Don't allow ARCH="sparc" for sparc64 targets with 32-bit userland
++if (test "$HOST_ARCH" = "sparc64" && test "$TARGET_ARCH" = "sparc") ; then
++	TARGET_ARCH="sparc64"
++fi
++echo "ARCH=${TARGET_ARCH/i?86/i386}" >> make_include
+ 
+ #
+ # 1. Do we have <locale.h>?
diff --git a/sys-apps/kbd/kbd-1.12-r7.ebuild b/sys-apps/kbd/kbd-1.12-r7.ebuild
new file mode 100644
index 000000000000..9c8160698b03
--- /dev/null
+++ b/sys-apps/kbd/kbd-1.12-r7.ebuild
@@ -0,0 +1,107 @@
+# 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-r7.ebuild,v 1.1 2006/06/28 15:15:47 solar Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="http://freshmeat.net/projects/kbd/"
+SRC_URI="ftp://ftp.cwi.nl/pub/aeb/kbd/${P}.tar.gz
+	ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/${P}.tar.gz
+	nls? ( http://www.users.one.se/liket/svorak/svorakln.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	local a
+	# Workaround problem on JFS filesystems, see bug 42859
+	for a in ${A} ; do
+		echo ">>> Unpacking ${a} to ${WORKDIR}"
+		gzip -dc "${DISTDIR}"/${a} | tar xf -
+		assert
+	done
+
+	cd "${S}"
+	sed -i \
+		-e "/^CFLAGS/ s:-O2:${CFLAGS}:g" \
+		-e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
+		-e "s:install -s:install:" \
+		src/Makefile.in \
+		openvt/Makefile
+
+	if tc-is-cross-compiler; then
+		tc-export CC
+		# Cross-compiling: don't run test programs
+		sed -i -e "s:&& ./conftest::" configure || \
+			die "Could not do sed configure for cross-compile"
+	fi
+
+	# Other patches from RH
+	epatch "${FILESDIR}"/${PN}-1.08-terminal.patch
+
+	epatch "${FILESDIR}"/${P}-configure-LANG.patch #128253
+
+	# Fixes a problem where loadkeys matches dvorak the dir, and not the
+	# .map inside
+	epatch "${FILESDIR}"/${P}-find-map-fix.patch
+
+	# Sparc have not yet fixed struct kbd_rate to use 'period' and not 'rate'
+	epatch "${FILESDIR}"/${P}-kbd_repeat-v2.patch
+
+	# misc fixes from debian
+	epatch "${FILESDIR}"/${P}-debian.patch
+
+	# Provide a QWERTZ and QWERTY cz map #19010
+	cp data/keymaps/i386/{qwerty,qwertz}/cz.map || die "cz qwerty"
+	epatch "${FILESDIR}"/${P}-cz-qwerty-map.patch
+
+	# Fix jp map to recognize Ctrl-[ as Escape #71870
+	epatch "${FILESDIR}"/${P}-jp-escape.patch
+
+	# Patches from Fedora
+	epatch "${FILESDIR}"/${P}-Meta_utf8.patch
+	## Fix runtime with gcc4 (setfont: Input file: trailing garbage)
+	epatch "${FILESDIR}"/${P}-alias.patch
+	epatch "${FILESDIR}"/${P}-setfont-man.patch
+
+	# cross-compile fails for powerpc targets bug #133856
+	epatch "${FILESDIR}"/${P}-xcompile.patch
+}
+
+src_compile() {
+	local myconf=
+	# Non-standard configure script; --disable-nls to
+	# disable NLS, nothing to enable it.
+	use nls || myconf="--disable-nls"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--datadir=/usr/share \
+		${myconf} || die
+
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	mv "${D}"/usr/bin/setfont "${D}"/bin/
+	dosym /bin/setfont /usr/bin/setfont
+
+	dodoc CHANGES CREDITS README
+	dodir /usr/share/doc/${PF}/html
+	cp -dR doc/* "${D}"/usr/share/doc/${PF}/html/
+
+	if use nls ; then
+		cd ${WORKDIR}/mnt/e/SvorakLN
+		insinto /usr/share/keymaps/i386/dvorak/
+		doins .svorakmap svorak.map.gz
+		dodoc Svorak.txt
+	fi
+}