Add patches from fedora.

(Portage version: 2.0.51.21-r1)

7 files changed, 187 insertions, 8 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 3da4330cc750..d192c06a3526 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/kbd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.35 2005/01/02 23:25:09 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.36 2005/05/19 14:30:38 azarah Exp $
+
+*kbd-1.12-r5 (19 May 2005)
+
+  19 May 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/kbd-1.12-Meta_utf8.patch, +files/kbd-1.12-alias.patch,
+  +files/kbd-1.12-setfont-man.patch, +kbd-1.12-r5.ebuild:
+  Add patches from fedora.
 
   02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index a8ba9904cef8..74a35eb41bd7 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,12 +1,17 @@
-MD5 fe04a9a95dd007b3dc5924e2caa0c800 ChangeLog 6373
 MD5 c97b4f642915a0eeaf8ca16bbadd33fa kbd-1.12-r4.ebuild 2343
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 fe04a9a95dd007b3dc5924e2caa0c800 ChangeLog 6373
 MD5 63c7eb210ae073232511598003383e51 kbd-1.12-r3.ebuild 2200
-MD5 2fff8da17e566c258df2888fbc599c23 files/kbd-1.12-cz-qwerty-map.patch 5821
-MD5 590a77d26b0b25a4217435ffa8bcd18a files/kbd-1.12-debian.patch 2628
-MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r4 118
-MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r3 118
+MD5 65e1af11e58b75178cfe8b002446d945 kbd-1.12-r5.ebuild 2560
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 3e2652f1b8451784488b743b6e0dd556 files/kbd-1.12-find-map-fix.patch 957
-MD5 6e007f04a80358ea81b27c80498a4808 files/kbd-1.08-terminal.patch 925
 MD5 58617e4171ee3357153c9793be062524 files/kbd-1.12-it-euro-map.patch 501
+MD5 d03cdb6117cda1a23cb90b91ab133c3e files/kbd-1.12-alias.patch 1129
+MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r5 118
 MD5 5f28051ad309ee4e481ef3b2b9cc9714 files/kbd-1.12-kbd_repeat-v2.patch 809
+MD5 590a77d26b0b25a4217435ffa8bcd18a files/kbd-1.12-debian.patch 2628
+MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r4 118
+MD5 fa826e223fa8177a8faff98b798cf601 files/kbd-1.12-Meta_utf8.patch 344
+MD5 ff84eec635b7a1578ef1284b994f779b files/kbd-1.12-setfont-man.patch 629
+MD5 6e007f04a80358ea81b27c80498a4808 files/kbd-1.08-terminal.patch 925
+MD5 2fff8da17e566c258df2888fbc599c23 files/kbd-1.12-cz-qwerty-map.patch 5821
+MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r3 118
diff --git a/sys-apps/kbd/files/digest-kbd-1.12-r5 b/sys-apps/kbd/files/digest-kbd-1.12-r5
new file mode 100644
index 000000000000..97dbb48e0136
--- /dev/null
+++ b/sys-apps/kbd/files/digest-kbd-1.12-r5
@@ -0,0 +1,2 @@
+MD5 7892c7010512a9bc6697a295c921da25 kbd-1.12.tar.gz 884827
+MD5 c3bc810b784880c9bb5a6fe80d95a696 svorakln.tar.gz 3030
diff --git a/sys-apps/kbd/files/kbd-1.12-Meta_utf8.patch b/sys-apps/kbd/files/kbd-1.12-Meta_utf8.patch
new file mode 100644
index 000000000000..9bc68b69745a
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-Meta_utf8.patch
@@ -0,0 +1,11 @@
+--- kbd-1.12/src/ksyms.c.org	2005-01-11 16:38:32.000000000 +0100
++++ kbd-1.12/src/ksyms.c	2005-01-11 16:46:19.000000000 +0100
+@@ -1710,6 +1710,8 @@
+ 		keycode = ksymtocode(s+5);
+ 		if (KTYP(keycode) == KT_LATIN)
+ 			return K(KT_META, KVAL(keycode));
++		else if(prefer_unicode)
++		        return (0);
+ 		/* fall through to error printf */
+ 	}
+ 
diff --git a/sys-apps/kbd/files/kbd-1.12-alias.patch b/sys-apps/kbd/files/kbd-1.12-alias.patch
new file mode 100644
index 000000000000..30be4fae46e7
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-alias.patch
@@ -0,0 +1,47 @@
+diff -u kbd-1.12/src/psffontop.c kbd-1.12/src/psffontop.c
+--- kbd-1.12/src/psffontop.c	2005-03-12 00:48:30.075310872 +0100
++++ kbd-1.12/src/psffontop.c	2005-05-14 10:49:59.000000000 +0900
+@@ -59,7 +59,6 @@
+ 
+ static unsigned int
+ assemble_ucs2(char **inptr, int cnt) {
+-	unsigned char **in = (unsigned char **) inptr;
+ 	unsigned int u1, u2;
+ 
+ 	if (cnt < 2) {
+@@ -68,8 +67,8 @@
+ 		exit(EX_DATAERR);
+ 	}
+ 
+-	u1 = *(*in)++;
+-	u2 = *(*in)++;
++	u1 = (unsigned char)*(*inptr)++;
++	u2 = (unsigned char)*(*inptr)++;
+ 	return (u1 | (u2 << 8));
+ }
+ 
+@@ -110,7 +109,6 @@
+  */
+ static void
+ get_uni_entry(char **inptr, char **endptr, struct unicode_list *up, int utf8) {
+-	unsigned char **in = (unsigned char **) inptr;
+ 	unsigned char uc;
+ 	unicode unichar;
+ 	int inseq = 0;
+@@ -126,14 +124,14 @@
+ 			exit(EX_DATAERR);
+ 		}
+ 		if (utf8) {
+-			uc = *(*in)++;
++			uc = *(*inptr)++;
+ 			if (uc == PSF2_SEPARATOR)
+ 				break;
+ 			if (uc == PSF2_STARTSEQ) {
+ 				inseq = 1;
+ 				continue;
+ 			}
+-			--(*in);
++			--(*inptr);
+ 			unichar = assemble_utf8(inptr, *endptr - *inptr);
+ 		} else {
+ 			unichar = assemble_ucs2(inptr, *endptr - *inptr);
diff --git a/sys-apps/kbd/files/kbd-1.12-setfont-man.patch b/sys-apps/kbd/files/kbd-1.12-setfont-man.patch
new file mode 100644
index 000000000000..73cce39099f9
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-setfont-man.patch
@@ -0,0 +1,14 @@
+diff -Nrbu kbd-1.12/man/man8/setfont.8.in kbd-1.12-OK/man/man8/setfont.8.in
+--- kbd-1.12/man/man8/setfont.8.in	2004-01-03 07:15:59.000000000 +0300
++++ kbd-1.12-OK/man/man8/setfont.8.in	2004-11-26 19:20:15.000000000 +0300
+@@ -50,6 +50,10 @@
+ Load a given font (here a 512-glyph font combining several
+ character sets) and indicate that one's local character set
+ is ISO 8859-2.
++.LP
++Note: if a font has more than 256 glyphs, only 8 out of 16 colors
++can be used simultaneously. It can make console perception worse
++(loss of intensity and even some colors).
+ 
+ .SH "FONT FORMATS"
+ The standard Linux font format is the PSF font.
diff --git a/sys-apps/kbd/kbd-1.12-r5.ebuild b/sys-apps/kbd/kbd-1.12-r5.ebuild
new file mode 100644
index 000000000000..7916e535fae7
--- /dev/null
+++ b/sys-apps/kbd/kbd-1.12-r5.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r5.ebuild,v 1.1 2005/05/19 14:30:38 azarah 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 "s:-O2:${CFLAGS}:g" \
+		-e 's:install -s:install:' \
+		src/Makefile.in
+
+	# Other patches from RH
+	epatch "${FILESDIR}"/${PN}-1.08-terminal.patch
+
+	# 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
+
+	# The italian keymap is missing euro support #75970
+	epatch "${FILESDIR}"/${P}-it-euro-map.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
+}
+
+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
+}