add svorak keymap #55643 and fix cz keymap #19010

6 files changed, 268 insertions, 3 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 091be048c18f..29bcbc34ed7d 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/kbd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.32 2004/07/17 05:25:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.33 2004/10/26 01:46:20 vapier Exp $
+
+*kbd-1.12-r3 (26 Oct 2004)
+
+  26 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/kbd-1.12-cz-qwerty-map.patch, +files/kbd-1.12-debian.patch,
+  +kbd-1.12-r3.ebuild:
+  Fix cz keymaps #19010 by kavol@email.cz. Include svorak keymap #55643 by
+  David Holm. Grab some updates from debian.
 
   16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> kbd-1.12-r2.ebuild:
   use emake
diff --git a/sys-apps/kbd/files/digest-kbd-1.12-r3 b/sys-apps/kbd/files/digest-kbd-1.12-r3
new file mode 100644
index 000000000000..97dbb48e0136
--- /dev/null
+++ b/sys-apps/kbd/files/digest-kbd-1.12-r3
@@ -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-cz-qwerty-map.patch b/sys-apps/kbd/files/kbd-1.12-cz-qwerty-map.patch
new file mode 100644
index 000000000000..8723b59e5999
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-cz-qwerty-map.patch
@@ -0,0 +1,88 @@
+--- data/keymaps/i386/qwerty/cz.map.old	2004-06-21 00:03:22.000000000 +0200
++++ data/keymaps/i386/qwerty/cz.map	2004-10-24 16:04:44.471056808 +0200
+@@ -1,6 +1,9 @@
++# *** toto neni originalni verze souboru:
++# *** upraveno z puvodni QWERTZ na QWERTY + opraveno par preklepu
++#
+ # Tato keymapa NENI urcena pro jadro "opatchovane" programem "patch-capslock"
+ #
+-# klavesova mapa kompatibilni s windows QWERTZ
++# klavesova mapa kompatibilni s windows QWERTY
+ #
+ # Vytvoril: Richard S~puta, Richard.Sputa@os3.os.ds.mfcr.cz
+ #
+@@ -11,7 +14,7 @@
+ # Links: ftp://ftp.penguin.cz/pub/cestina/klavesnice/console/
+ #        - primary ftp archiv
+ #        http://www.debian.cz/proj/czkbd/index.php3
+-#        - czech keyboard standarts
++#        - czech keyboard standards
+ #
+ #
+ # POZOR: Tato klavesova mapa obsahuje ve skutecnosti 2 (dve) klavesnice
+@@ -27,7 +30,7 @@
+ #               Navic klavesa "PrintScreen" funguje jako carka a hacek
+ #
+ #
+-# Rozsireni oproti standartni_CESKE_unikodove_klavesnici
++# Rozsireni oproti standardni_CESKE_unikodove_klavesnici
+ #         (zde jsou popsany pouze kombinace, jejichz umisteni je diskutabilni)
+ #         (popis ostatnich rozsireni je v souboru "readme.txt")
+ #        1) AltGr-SPACE => znak "nobreakspace" (neoddelitelna mezera kod 0xa0)
+@@ -148,7 +151,7 @@
+ #          Linefeed  (primarni) => Control_j
+ #
+ # vzdalenost mezi zacatky symbolu:
+-#          12 znaku (standartne) vyhovuje 80% symbolickych nazvu
++#          12 znaku (standardne) vyhovuje 80% symbolickych nazvu
+ #          25 znaku ma symbolicky nazev Meta_Control_bracketright
+ #             123456789012 123456789012 123456789012 123456789012 123456789012 
+ keycode   1 = Escape       Escape       VoidSymbol   VoidSymbol   VoidSymbol  \
+@@ -383,15 +386,15 @@
+               VoidSymbol   VoidSymbol   +T           t            VoidSymbol  \
+               VoidSymbol   VoidSymbol   VoidSymbol   Meta_T       Meta_t      \
+               VoidSymbol
+-keycode  21 = +z           Z            VoidSymbol   VoidSymbol   Control_z   \
+-              Control_z    VoidSymbol   VoidSymbol   Meta_z       Meta_Z      \
+-              VoidSymbol   VoidSymbol   +Z           z            VoidSymbol  \
+-              VoidSymbol   VoidSymbol   VoidSymbol   Meta_Z       Meta_z      \
++keycode  21 = +y           Y            VoidSymbol   VoidSymbol   Control_y   \
++              Control_y    VoidSymbol   VoidSymbol   Meta_y       Meta_Y      \
++              VoidSymbol   VoidSymbol   +Y           y            VoidSymbol  \
++              VoidSymbol   VoidSymbol   VoidSymbol   Meta_Z       Meta_y      \
+               VoidSymbol                                                      \
+-              +z           Z            VoidSymbol   VoidSymbol   Control_z   \
+-              Control_z    VoidSymbol   VoidSymbol   Meta_z       Meta_Z      \
+-              VoidSymbol   VoidSymbol   +Z           z            VoidSymbol  \
+-              VoidSymbol   VoidSymbol   VoidSymbol   Meta_Z       Meta_z      \
++              +y           Y            VoidSymbol   VoidSymbol   Control_y   \
++              Control_y    VoidSymbol   VoidSymbol   Meta_y       Meta_Y      \
++              VoidSymbol   VoidSymbol   +Y           y            VoidSymbol  \
++              VoidSymbol   VoidSymbol   VoidSymbol   Meta_Y       Meta_y      \
+               VoidSymbol
+ keycode  22 = +u           U            VoidSymbol   VoidSymbol   Control_u   \
+               Control_u    VoidSymbol   VoidSymbol   Meta_u       Meta_U      \
+@@ -601,15 +604,15 @@
+               Meta_Control_backslash    bar          bar          VoidSymbol  \
+               VoidSymbol   VoidSymbol   VoidSymbol   Meta_bar     Meta_bar    \
+               VoidSymbol
+-keycode  44 = +y           Y            degree       degree       Control_y   \
+-              Control_y    VoidSymbol   VoidSymbol   Meta_y       Meta_Y      \
+-              VoidSymbol   VoidSymbol   +Y           y            VoidSymbol  \
+-              VoidSymbol   VoidSymbol   VoidSymbol   Meta_Y       Meta_y      \
++keycode  44 = +z           Z            degree       degree       Control_z   \
++              Control_z    VoidSymbol   VoidSymbol   Meta_z       Meta_Z      \
++              VoidSymbol   VoidSymbol   +Z           z            VoidSymbol  \
++              VoidSymbol   VoidSymbol   VoidSymbol   Meta_Z       Meta_z      \
+               VoidSymbol                                                      \
+-              +y           Y            degree       degree       Control_y   \
+-              Control_y    VoidSymbol   VoidSymbol   Meta_y       Meta_Y      \
+-              VoidSymbol   VoidSymbol   +Y           y            VoidSymbol  \
+-              VoidSymbol   VoidSymbol   VoidSymbol   Meta_Y       Meta_y      \
++              +z           Z            degree       degree       Control_z   \
++              Control_z    VoidSymbol   VoidSymbol   Meta_z       Meta_Z      \
++              VoidSymbol   VoidSymbol   +Z           z            VoidSymbol  \
++              VoidSymbol   VoidSymbol   VoidSymbol   Meta_Z       Meta_z      \
+               VoidSymbol
+ keycode  45 = +x           X            numbersign   numbersign   Control_x   \
+               Control_x    VoidSymbol   VoidSymbol   Meta_x       Meta_X      \
diff --git a/sys-apps/kbd/files/kbd-1.12-debian.patch b/sys-apps/kbd/files/kbd-1.12-debian.patch
new file mode 100644
index 000000000000..de1e402e7047
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-debian.patch
@@ -0,0 +1,86 @@
+diff -urNad /home/wart/Projects/debian/kbd/new/kbd-1.12/src/loadkeys.y kbd-1.12/src/loadkeys.y
+--- /home/wart/Projects/debian/kbd/new/kbd-1.12/src/loadkeys.y	2004-01-27 14:25:50.000000000 +0300
++++ kbd-1.12/src/loadkeys.y	2004-01-27 14:37:01.000000000 +0300
+@@ -566,7 +566,7 @@
+ }
+ 
+ char *dirpath[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
+-char *suffixes[] = { "", ".map", 0 };
++char *suffixes[] = { "", ".kmap", ".map", 0 };
+ extern FILE *findfile(char *fnam, char **dirpath, char **suffixes);
+ 
+ #undef yywrap
+diff -urNad /opt/tmp/kbd-1.12/src/loadunimap.c kbd-1.12/src/loadunimap.c
+--- /opt/tmp/kbd-1.12/src/loadunimap.c	2004-08-02 22:57:25.000000000 +0200
++++ kbd-1.12/src/loadunimap.c	2004-08-02 22:57:44.000000000 +0200
+@@ -28,8 +28,8 @@
+ extern char *progname;
+ extern int force;
+ 
+-static char *unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 };
+-static char *unisuffixes[] = { "", ".uni", 0 };
++static char *unidirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };
++static char *unisuffixes[] = { "", ".sfm", ".uni", 0 };
+ 
+ #ifdef MAIN
+ #include "version.h"
+diff -urNad /opt/tmp/kbd-1.12/src/getunimap.c kbd-1.12/src/getunimap.c
+--- /opt/tmp/kbd-1.12/src/getunimap.c	2004-08-01 20:33:38.000000000 +0200
++++ kbd-1.12/src/getunimap.c	2004-08-02 22:45:30.000000000 +0200
+@@ -62,7 +62,7 @@
+ 		}
+ 	}
+ 
+-	if (argc != 1)
++	if (optind < argc)
+ 		usage();
+ 
+ 	fd = getfd(console);
+diff -urNad /opt/tmp/kbd-1.12/src/loadunimap.c kbd-1.12/src/loadunimap.c
+--- /opt/tmp/kbd-1.12/src/loadunimap.c	2004-08-02 22:45:06.000000000 +0200
++++ kbd-1.12/src/loadunimap.c	2004-08-02 22:46:39.000000000 +0200
+@@ -73,18 +73,18 @@
+ 		}
+ 	}
+ 
+-	if (argc > 2 || (argc == 1 && !outfnam))
++	if (argc > optind+1 || (argc == optind && !outfnam))
+ 		usage();
+ 
+ 	fd = getfd(console);
+ 
+ 	if (outfnam) {
+ 		saveunicodemap(fd, outfnam);
+-		if (argc == 1)
++		if (argc == optind)
+ 			exit(0);
+ 	}
+ 
+-	if (argc == 2)
++	if (argc == optind+1)
+ 		infnam = argv[optind];
+ 	loadunicodemap(fd, infnam);
+ 	exit(0);
+diff -urNad /opt/tmp/kbd-1.12/src/showconsolefont.c kbd-1.12/src/showconsolefont.c
+--- /opt/tmp/kbd-1.12/src/showconsolefont.c	2004-08-02 22:44:30.000000000 +0200
++++ kbd-1.12/src/showconsolefont.c	2004-08-02 22:47:07.000000000 +0200
+@@ -135,7 +135,7 @@
+ 		}
+ 	}
+ 
+-	if (argc != 1)
++	if (optind < argc)
+ 		usage();
+ 
+ 	fd = getfd(console);
+--- kbd-1.12.orig/src/kbdrate.c
++++ kbd-1.12/src/kbdrate.c
+@@ -112,7 +112,7 @@
+ 	kbdrep_s.period = -1;
+ 	kbdrep_s.delay = -1;
+ 	if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
+-		if (errno == EINVAL)
++		if (errno == EINVAL || errno == ENOTTY)
+ 			return 0;
+ 		perror( "ioctl(KDKBDREP)" );
+ 		exit( 1 );
diff --git a/sys-apps/kbd/kbd-1.12-r2.ebuild b/sys-apps/kbd/kbd-1.12-r2.ebuild
index c8f2e47803da..71cc630a1623 100644
--- a/sys-apps/kbd/kbd-1.12-r2.ebuild
+++ b/sys-apps/kbd/kbd-1.12-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.11 2004/07/17 05:25:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r2.ebuild,v 1.12 2004/10/26 01:46:20 vapier Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cwi.nl/pub/aeb/kbd/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="nls"
 
 DEPEND="virtual/libc
diff --git a/sys-apps/kbd/kbd-1.12-r3.ebuild b/sys-apps/kbd/kbd-1.12-r3.ebuild
new file mode 100644
index 000000000000..69ac3f05afbc
--- /dev/null
+++ b/sys-apps/kbd/kbd-1.12-r3.ebuild
@@ -0,0 +1,81 @@
+# 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 $
+
+inherit eutils
+
+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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nls"
+
+DEPEND="virtual/libc
+	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 -
+	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
+
+	# 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
+}
+
+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 || 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
+}