Update version. Add proper patch from Andries for this version.

5 files changed, 115 insertions, 1 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index b5097346b55f..2d313e834e59 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kbd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.23 2004/01/29 00:51:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.24 2004/01/29 18:34:11 azarah Exp $
+
+*kbd-1.12 (29 Jan 2004)
+
+  29 Jan 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.12.ebuild,
+  files/kbd-1.12-find-map-fix.patch:
+  Update version.  Add proper patch from Andries for this version.
 
 *kbd-1.08-r5 (29 Jan 2004)
 
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 4551c6ead7ce..fc789cba2577 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,6 +1,7 @@
 MD5 31bf8d57cb351f1df860c9bb888e17a1 ChangeLog 4260
 MD5 fed33c113d65cf0c5f84e221d98e8cd0 kbd-1.08-r4.ebuild 1881
 MD5 d38a4950a4e1f7f8f0fe13a56fee3dba kbd-1.08-r5.ebuild 2011
+MD5 86a1526e9415df2ee33c99273fa00b6f kbd-1.12.ebuild 1669
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 ce9713c16780e814e844ca87ffaa7ce4 kbd-1.06-r1.ebuild 1120
 MD5 475c159d5e9aacca7474233633b74d35 files/kbd-1.08-find-map-fix.patch 833
@@ -10,5 +11,7 @@ MD5 bae0fb2144b6ea25fbaacf1e36452f48 files/kbd-1.08-nowarn.patch 341
 MD5 756f158177d250477cb5e2426fa5b477 files/kbd-1.08-kbd_repeat.patch 4136
 MD5 f6af43f3979cc9d66a938d22c1727388 files/digest-kbd-1.08-r5 60
 MD5 86535adb8da923e0df3c58d9caa35ae6 files/kbd-1.06-othervt.patch 1605
+MD5 7c826f293d2f1ae5c4de4031c19cd47d files/digest-kbd-1.12 60
 MD5 6e007f04a80358ea81b27c80498a4808 files/kbd-1.08-terminal.patch 925
+MD5 3e2652f1b8451784488b743b6e0dd556 files/kbd-1.12-find-map-fix.patch 957
 MD5 f6af43f3979cc9d66a938d22c1727388 files/digest-kbd-1.08-r4 60
diff --git a/sys-apps/kbd/files/digest-kbd-1.12 b/sys-apps/kbd/files/digest-kbd-1.12
new file mode 100644
index 000000000000..b2e1581b948e
--- /dev/null
+++ b/sys-apps/kbd/files/digest-kbd-1.12
@@ -0,0 +1 @@
+MD5 7892c7010512a9bc6697a295c921da25 kbd-1.12.tar.gz 884827
diff --git a/sys-apps/kbd/files/kbd-1.12-find-map-fix.patch b/sys-apps/kbd/files/kbd-1.12-find-map-fix.patch
new file mode 100644
index 000000000000..ca24703fcb5b
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-find-map-fix.patch
@@ -0,0 +1,37 @@
+Oh, but I fixed it already. Patch below.
+
+Andries
+
+--- kbd-1.12.orig/src/findfile.c    Fri Jan 16 20:45:31 2004
++++ kbd-1.12/src/findfile.c        Wed Jan 28 23:29:35 2004
+@@ -70,6 +70,7 @@
+ 	FILE *fp = NULL;
+ 	DIR *d;
+ 	struct dirent *de;
++	struct stat statbuf;
+ 	char *ff, *fdir, *p, *q, **sp;
+ 	struct decompressor *dc;
+ 	int secondpass = 0;
+@@ -104,7 +105,6 @@
+ 	    okdir = (ff && strcmp(de->d_name, fdir) == 0);
+ 
+ 	    if ((secondpass && recdepth) || okdir) {
+-       		struct stat statbuf;
+ 		char *a;
+ 
+ 		a = xmalloc(strlen(dir) + strlen(de->d_name) + 2);
+@@ -137,6 +137,11 @@
+ 
+ 	    sprintf(pathname, "%s/%s", dir, de->d_name);
+ 
++	    /* Is this a regular file? */
++	    if (stat(pathname, &statbuf) != 0 ||
++		!S_ISREG(statbuf.st_mode))
++		continue;
++
+ 	    /* Does tail consist of a known suffix and possibly
+ 	       a compression suffix? */
+ 	    for(sp = suf; *sp; sp++) {
+
+
+[pasted and cut from another window, so with whitespace damage]
diff --git a/sys-apps/kbd/kbd-1.12.ebuild b/sys-apps/kbd/kbd-1.12.ebuild
new file mode 100644
index 000000000000..d8e9c3f1f159
--- /dev/null
+++ b/sys-apps/kbd/kbd-1.12.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12.ebuild,v 1.1 2004/01/29 18:34:11 azarah Exp $
+
+IUSE="nls"
+
+inherit eutils
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Keyboard and console utilities"
+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"
+HOMEPAGE="http://freshmeat.net/projects/kbd/"
+
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~ia64 ~ppc64"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc nls? ( sys-devel/gettext )"
+PROVIDE="sys-apps/console-tools"
+
+src_unpack() {
+	unpack ${A}
+
+	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
+}
+
+src_compile() {
+	local myconf=
+
+	# Non-standard configure script; --disable-nls to
+	# disable NLS, nothing to enable it.
+	use nls || myconf="--disable-nls"
+
+	# We should not add the prefix to mandir and datadir
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--datadir=/usr/share \
+		${myconf} || die
+
+	make || die
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		DATADIR=${D}/usr/share \
+		MANDIR=${D}/usr/share/man \
+		install || die
+
+	mv ${D}/usr/bin/setfont ${D}/bin/
+	dosym ../../bin/setfont /usr/bin/setfont
+
+	dodoc CHANGES CREDITS COPYING README
+	dodir /usr/share/doc/${PF}/html
+	cp -dR doc/* ${D}/usr/share/doc/${PF}/html/
+}
+