diff options
| -rw-r--r-- | sys-apps/kbd/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/kbd/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/kbd/files/digest-kbd-1.12-r2 | 1 | ||||
| -rw-r--r-- | sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch | 25 | ||||
| -rw-r--r-- | sys-apps/kbd/kbd-1.12-r2.ebuild | 70 |
5 files changed, 106 insertions, 1 deletions
diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog index f9f56d66faa3..de921d79b024 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.25 2004/02/08 14:23:47 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.26 2004/02/08 15:25:08 azarah Exp $ + +*kbd-1.12-r2 (08 Feb 2004) + + 08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> kbd-1.12-r2.ebuild, + files/kbd-1.12-kbd_repeat-v2.patch: + Update patch from Andries again. *kbd-1.12-r1 (08 Feb 2004) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index f88e8a4b0e8d..3b1a41a1a8fa 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,3 +1,4 @@ +MD5 fe1535faa3b58b13f29a79ec26343f40 kbd-1.12-r2.ebuild 1791 MD5 3ee361b81f84aa7ef7f1d00c34194f45 ChangeLog 4723 MD5 fed33c113d65cf0c5f84e221d98e8cd0 kbd-1.08-r4.ebuild 1881 MD5 d38a4950a4e1f7f8f0fe13a56fee3dba kbd-1.08-r5.ebuild 2011 @@ -6,9 +7,11 @@ MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 ce9713c16780e814e844ca87ffaa7ce4 kbd-1.06-r1.ebuild 1120 MD5 1d47cb92efcb8505461b55aff9934c5b kbd-1.12-r1.ebuild 1788 MD5 475c159d5e9aacca7474233633b74d35 files/kbd-1.08-find-map-fix.patch 833 +MD5 7c826f293d2f1ae5c4de4031c19cd47d files/digest-kbd-1.12-r2 60 MD5 b1f1dbd569840cc0e1c97a7431466964 files/digest-kbd-1.06-r1 60 MD5 5b55b831e2ba400e09936d649e78a065 files/kbd-1.08-po-install-locations.patch 490 MD5 bae0fb2144b6ea25fbaacf1e36452f48 files/kbd-1.08-nowarn.patch 341 +MD5 3492e6d5769a7bcb8d19dddf46f3a08e files/kbd-1.12-kbd_repeat-v2.patch 756 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 diff --git a/sys-apps/kbd/files/digest-kbd-1.12-r2 b/sys-apps/kbd/files/digest-kbd-1.12-r2 new file mode 100644 index 000000000000..b2e1581b948e --- /dev/null +++ b/sys-apps/kbd/files/digest-kbd-1.12-r2 @@ -0,0 +1 @@ +MD5 7892c7010512a9bc6697a295c921da25 kbd-1.12.tar.gz 884827 diff --git a/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch b/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch new file mode 100644 index 000000000000..bc924b7d2176 --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch @@ -0,0 +1,25 @@ +--- kbd-1.12/src/kbdrate.c Fri Jan 16 20:45:31 2004 ++++ kbd-1.12.kbdrate/src/kbdrate.c Sun Feb 8 14:52:04 2004 +@@ -164,10 +169,10 @@ + exit( 1 ); + } + +- kbdrate_s.period = (int) (rate + 0.5); /* round up */ ++ kbdrate_s.rate = (int) (rate + 0.5); /* round up */ + kbdrate_s.delay = delay * HZ / 1000; /* convert ms to Hz */ +- if (kbdrate_s.period > 50) +- kbdrate_s.period = 50; ++ if (kbdrate_s.rate > 50) ++ kbdrate_s.rate = 50; + + if (ioctl( fd, KIOCSRATE, &kbdrate_s )) { + perror( "ioctl(KIOCSRATE)" ); +@@ -177,7 +182,7 @@ + + if (!silent) + printf( "Typematic Rate set to %d cps (delay = %d ms)\n", +- kbdrate_s.period, kbdrate_s.delay * 1000 / HZ ); ++ kbdrate_s.rate, kbdrate_s.delay * 1000 / HZ ); + + return 1; + #else /* no KIOCSRATE */ diff --git a/sys-apps/kbd/kbd-1.12-r2.ebuild b/sys-apps/kbd/kbd-1.12-r2.ebuild new file mode 100644 index 000000000000..c4d66eceaf57 --- /dev/null +++ b/sys-apps/kbd/kbd-1.12-r2.ebuild @@ -0,0 +1,70 @@ +# 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-r2.ebuild,v 1.1 2004/02/08 15:25:08 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 + + # Sparc have not yet fixed struct kbd_rate to use 'period' and not 'rate'. + epatch ${FILESDIR}/${P}-kbd_repeat-v2.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/ +} + |