Fix copyright date; cleanup

11 files changed, 6 insertions, 376 deletions

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index eeec9fb56fbc..a368eab7fbad 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,19 +1,11 @@
-MD5 4d1107e85a92f48d767d57651efeee83 kbd-1.08-r2.ebuild 1550
-MD5 5554e78210a3583186e0b3fbe4f1a8f3 kbd-1.08-r3.ebuild 1707
 MD5 fca5e7c48a81a4278ae89e3ec27c1259 ChangeLog 4040
-MD5 f9a4c61af786e3cd5df75c8b0d69129f kbd-1.08-r4.ebuild 1880
-MD5 4cc908e158d84eddfb6e9a67133938e7 kbd-1.08-r1.ebuild 1549
+MD5 fed33c113d65cf0c5f84e221d98e8cd0 kbd-1.08-r4.ebuild 1881
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 17b0176ba7f61c6ee4b2aa69e47580d3 kbd-1.06-r1.ebuild 1122
-MD5 9dde9067630b0fb27bd8224753741463 files/kbd-1.08-sparc-fixes.patch 2375
-MD5 f6af43f3979cc9d66a938d22c1727388 files/digest-kbd-1.08-r2 60
+MD5 ce9713c16780e814e844ca87ffaa7ce4 kbd-1.06-r1.ebuild 1120
 MD5 b1f1dbd569840cc0e1c97a7431466964 files/digest-kbd-1.06-r1 60
 MD5 5b55b831e2ba400e09936d649e78a065 files/kbd-1.08-po-install-locations.patch 490
-MD5 f6af43f3979cc9d66a938d22c1727388 files/digest-kbd-1.08-r3 60
 MD5 bae0fb2144b6ea25fbaacf1e36452f48 files/kbd-1.08-nowarn.patch 341
 MD5 756f158177d250477cb5e2426fa5b477 files/kbd-1.08-kbd_repeat.patch 4136
 MD5 86535adb8da923e0df3c58d9caa35ae6 files/kbd-1.06-othervt.patch 1605
 MD5 6e007f04a80358ea81b27c80498a4808 files/kbd-1.08-terminal.patch 925
-MD5 720c6652e5f463d18b20e53a03495723 files/kbd-1.08-sparc.patch 2083
 MD5 f6af43f3979cc9d66a938d22c1727388 files/digest-kbd-1.08-r4 60
-MD5 f6af43f3979cc9d66a938d22c1727388 files/digest-kbd-1.08-r1 60
diff --git a/sys-apps/kbd/files/digest-kbd-1.08-r1 b/sys-apps/kbd/files/digest-kbd-1.08-r1
deleted file mode 100644
index 9b77d0dd0db3..000000000000
--- a/sys-apps/kbd/files/digest-kbd-1.08-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 924e6a05e52715dc0f96385b35f2f680 kbd-1.08.tar.gz 819924
diff --git a/sys-apps/kbd/files/digest-kbd-1.08-r2 b/sys-apps/kbd/files/digest-kbd-1.08-r2
deleted file mode 100644
index 9b77d0dd0db3..000000000000
--- a/sys-apps/kbd/files/digest-kbd-1.08-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 924e6a05e52715dc0f96385b35f2f680 kbd-1.08.tar.gz 819924
diff --git a/sys-apps/kbd/files/digest-kbd-1.08-r3 b/sys-apps/kbd/files/digest-kbd-1.08-r3
deleted file mode 100644
index 9b77d0dd0db3..000000000000
--- a/sys-apps/kbd/files/digest-kbd-1.08-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 924e6a05e52715dc0f96385b35f2f680 kbd-1.08.tar.gz 819924
diff --git a/sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch b/sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch
deleted file mode 100644
index 85aa2da088b5..000000000000
--- a/sys-apps/kbd/files/kbd-1.08-sparc-fixes.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- kbd-1.08/src/kbdrate.c.orig	2003-07-30 23:05:29.000000000 +0200
-+++ kbd-1.08/src/kbdrate.c	2003-07-30 23:14:24.000000000 +0200
-@@ -109,7 +109,11 @@
- 	struct kbd_repeat kbdrep_s;
- 
- 	/* don't change, just test */
-+#if defined (__sparc__) || defined (__sparc64__)
-+	kbdrep_s.rate = -1;
-+#else
- 	kbdrep_s.period = -1;
-+#endif
- 	kbdrep_s.delay = -1;
- 	if (ioctl( 0, KDKBDREP, &kbdrep_s )) {
- 		if (errno == EINVAL)
-@@ -125,11 +129,27 @@
- 
- 	/* do the change */
- 	if (rate == 0)				  /* switch repeat off */
-+#if defined (__sparc__) || defined (__sparc64__)
-+		kbdrep_s.rate = 0;
-+#else
- 		kbdrep_s.period = 0;
-+#endif
- 	else
-+#if defined (__sparc__) || defined (__sparc64__)
-+		kbdrep_s.rate  = 1000.0 / rate; /* convert cps to msec */
-+#else
- 		kbdrep_s.period  = 1000.0 / rate; /* convert cps to msec */
-+#endif
-+#if defined (__sparc__) || defined (__sparc64__)
-+	if (kbdrep_s.rate < 1)
-+#else
- 	if (kbdrep_s.period < 1)
-+#endif
-+#if defined (__sparc__) || defined (__sparc64__)
-+		kbdrep_s.rate = 1;
-+#else
- 		kbdrep_s.period = 1;
-+#endif
- 	kbdrep_s.delay = delay;
- 	if (kbdrep_s.delay < 1)
- 		kbdrep_s.delay = 1;
-@@ -140,10 +160,18 @@
- 	}
- 
- 	/* report */
-+#if defined (__sparc__) || defined (__sparc64__)
-+	if (kbdrep_s.rate == 0)
-+#else
- 	if (kbdrep_s.period == 0)
-+#endif
- 		rate = 0;
- 	else
-+#if defined (__sparc__) || defined (__sparc64__)
-+		rate = 1000.0 / (double) kbdrep_s.rate;
-+#else
- 		rate = 1000.0 / (double) kbdrep_s.period;
-+#endif
- 
- 	if (!silent)
- 		printf( _("Typematic Rate set to %.1f cps (delay = %d ms)\n"),
-@@ -164,10 +192,19 @@
- 		exit( 1 );
- 	}
- 
-+#if defined (__sparc__) || defined (__sparc64__)
-+	kbdrate_s.rate = (int) (rate + 0.5);  /* round up */
-+#else
- 	kbdrate_s.period = (int) (rate + 0.5);  /* round up */
-+#endif
- 	kbdrate_s.delay = delay * HZ / 1000;  /* convert ms to Hz */
-+#if defined (__sparc__) || defined (__sparc64__)
-+	if (kbdrate_s.rate > 50)
-+		kbdrate_s.rate = 50;
-+#else
- 	if (kbdrate_s.period > 50)
- 		kbdrate_s.period = 50;
-+#endif
- 
- 	if (ioctl( fd, KIOCSRATE, &kbdrate_s )) {
- 		perror( "ioctl(KIOCSRATE)" );
-@@ -177,7 +214,11 @@
- 
- 	if (!silent)
- 		printf( "Typematic Rate set to %d cps (delay = %d ms)\n",
-+#if defined (__sparc__) || defined (__sparc64__)
-+			kbdrate_s.rate, kbdrate_s.delay * 1000 / HZ );
-+#else
- 			kbdrate_s.period, kbdrate_s.delay * 1000 / HZ );
-+#endif
- 
- 	return 1;
- #else /* no KIOCSRATE */
diff --git a/sys-apps/kbd/files/kbd-1.08-sparc.patch b/sys-apps/kbd/files/kbd-1.08-sparc.patch
deleted file mode 100644
index 72d84605ed7d..000000000000
--- a/sys-apps/kbd/files/kbd-1.08-sparc.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Don't try unimplemented ioctls on SPARC, even if they
-are defined in headers -- that way lies madness.
-
---- kbd-1.08/man/man8/kbdrate.8	2002-10-11 07:08:58.000000000 -0400
-+++ kbd-1.08/man/man8/kbdrate.8	2002-11-22 17:28:15.000000000 -0500
-@@ -22,7 +22,7 @@
- without any options will reset the repeat rate to 10.9 characters per second (cps)
- and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems.
- These are the IBM defaults. On SPARC-based systems it will reset the repeat rate
--to 5 cps and the delay to 200 ms.
-+to 20 cps and the delay to 200 ms.
- 
- .SH OPTIONS
- .TP
-@@ -69,3 +69,5 @@
- .I /etc/rc.local
- .br
- .I /dev/port
-+.br
-+.I /dev/kbd
---- kbd-1.08/src/kbdrate.c	2002-10-11 07:09:01.000000000 -0400
-+++ kbd-1.08/src/kbdrate.c	2002-11-22 17:34:48.000000000 -0500
-@@ -104,8 +104,11 @@
- 
- static int
- KDKBDREP_ioctl_ok(double rate, int delay, int silent) {
-+#if defined(KDKBDREP) && !defined(__sparc__)
- 	/* This ioctl is defined in <linux/kd.h> but is not
--	   implemented anywhere - must be in some m68k patches. */
-+	   implemented anywhere - must be in some m68k patches.
-+	   We cannot blindly try unimplemented ioctls on sparc64 -
-+	   the 32<->64bit transition layer does not like it. */
- 	struct kbd_repeat kbdrep_s;
- 
- 	/* don't change, just test */
-@@ -150,6 +153,9 @@
- 			rate, kbdrep_s.delay );
- 
- 	return 1;			/* success! */
-+#else /* no KDKBDREP or __sparc__ */
-+	return 0;
-+#endif /* KDKBDREP */
- }
- 
- static int
-@@ -188,7 +194,7 @@
- int
- main( int argc, char **argv ) {
- #ifdef __sparc__
--	double      rate = 5.0;      /* Default rate */
-+	double      rate = 20.0;      /* Default rate */
- 	int         delay = 200;     /* Default delay */
- #else
- 	double      rate = 10.9;     /* Default rate */
-@@ -238,8 +244,9 @@
- 		return 0;
- 
- 
--	/* The ioport way */
-+	/* The ioport way - will crash on sparc */
- 
-+#ifndef __sparc__
- 	for (i = 0; i < RATE_COUNT; i++)
- 		if (rate * 10 >= valid_rates[i]) {
- 			value &= 0x60;
-@@ -285,5 +292,7 @@
- 			valid_rates[value & 0x1f] / 10.0,
- 			valid_delays[ (value & 0x60) >> 5 ] );
- 
-+#endif
-+
- 	return 0;
- }
diff --git a/sys-apps/kbd/kbd-1.06-r1.ebuild b/sys-apps/kbd/kbd-1.06-r1.ebuild
index 58491bf6e7c3..bdb8e3ef4dbd 100644
--- a/sys-apps/kbd/kbd-1.06-r1.ebuild
+++ b/sys-apps/kbd/kbd-1.06-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.06-r1.ebuild,v 1.22 2003/09/07 02:47:52 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.06-r1.ebuild,v 1.23 2004/01/19 18:48:55 azarah Exp $
 
 IUSE="nls"
 
diff --git a/sys-apps/kbd/kbd-1.08-r1.ebuild b/sys-apps/kbd/kbd-1.08-r1.ebuild
deleted file mode 100644
index 3adb0b092824..000000000000
--- a/sys-apps/kbd/kbd-1.08-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.08-r1.ebuild,v 1.4 2003/09/07 02:47:52 msterret 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"
-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
-
-	# Sparc have not yet fixed struct kbd_rate to use 'period' and not 'rate'.
-	epatch ${FILESDIR}/${P}-sparc-fixes.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=/share/man \
-		--datadir=/share \
-		${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		DATADIR=${D}/usr/share \
-		MANDIR=${D}/usr/share/man \
-		install || die
-
-	dodir /usr/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/
-}
-
diff --git a/sys-apps/kbd/kbd-1.08-r2.ebuild b/sys-apps/kbd/kbd-1.08-r2.ebuild
deleted file mode 100644
index 9daf67dd0114..000000000000
--- a/sys-apps/kbd/kbd-1.08-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.08-r2.ebuild,v 1.4 2003/09/17 23:58:40 avenj 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"
-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
-
-	# Sparc have not yet fixed struct kbd_rate to use 'period' and not 'rate'.
-	epatch ${FILESDIR}/${P}-kbd_repeat.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=/share/man \
-		--datadir=/share \
-		${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		DATADIR=${D}/usr/share \
-		MANDIR=${D}/usr/share/man \
-		install || die
-
-	dodir /usr/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/
-}
-
diff --git a/sys-apps/kbd/kbd-1.08-r3.ebuild b/sys-apps/kbd/kbd-1.08-r3.ebuild
deleted file mode 100644
index 4f127bca5f67..000000000000
--- a/sys-apps/kbd/kbd-1.08-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.08-r3.ebuild,v 1.1 2003/09/23 23:43:09 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"
-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
-
-	# Sparc have not yet fixed struct kbd_rate to use 'period' and not 'rate'.
-	epatch ${FILESDIR}/${P}-kbd_repeat.patch
-
-	# Locales do not use DATADIR corretly, and thus install to /share, and
-	# not /usr/share, bug #26384.
-	epatch ${FILESDIR}/${P}-po-install-locations.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=/share/man \
-		--datadir=/share \
-		${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		DATADIR=${D}/usr/share \
-		MANDIR=${D}/usr/share/man \
-		install || die
-
-	dodir /usr/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/
-}
-
diff --git a/sys-apps/kbd/kbd-1.08-r4.ebuild b/sys-apps/kbd/kbd-1.08-r4.ebuild
index c2b66ac4b0bc..405035d46ab9 100644
--- a/sys-apps/kbd/kbd-1.08-r4.ebuild
+++ b/sys-apps/kbd/kbd-1.08-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.08-r4.ebuild,v 1.4 2004/01/19 18:44:14 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.08-r4.ebuild,v 1.5 2004/01/19 18:48:55 azarah Exp $
 
 IUSE="nls"
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm ia64 ~ppc64"
 SLOT="0"
 LICENSE="GPL-2"