From b3bccfc04f8aac4305a1a869f375fc4c3c50ed78 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 29 Dec 2004 20:40:44 +0000 Subject: [PATCH] Add patch by Tupone Alfredo for italian maps to support the euro #75970. --- sys-apps/kbd/ChangeLog | 9 +- sys-apps/kbd/Manifest | 19 ++-- sys-apps/kbd/files/digest-kbd-1.12-r4 | 2 + .../kbd/files/kbd-1.12-cz-qwerty-map.patch | 13 +++ sys-apps/kbd/files/kbd-1.12-it-euro-map.patch | 18 ++++ .../kbd/files/kbd-1.12-kbd_repeat-v2.patch | 2 + sys-apps/kbd/kbd-1.12-r4.ebuild | 87 +++++++++++++++++++ 7 files changed, 141 insertions(+), 9 deletions(-) create mode 100644 sys-apps/kbd/files/digest-kbd-1.12-r4 create mode 100644 sys-apps/kbd/files/kbd-1.12-it-euro-map.patch create mode 100644 sys-apps/kbd/kbd-1.12-r4.ebuild diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog index 29bcbc34ed7d..cd17f7b637c8 100644 --- a/sys-apps/kbd/ChangeLog +++ b/sys-apps/kbd/ChangeLog @@ -1,6 +1,13 @@ # 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.33 2004/10/26 01:46:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.34 2004/12/29 20:40:44 vapier Exp $ + +*kbd-1.12-r4 (29 Dec 2004) + + 29 Dec 2004; Mike Frysinger + files/kbd-1.12-cz-qwerty-map.patch, +files/kbd-1.12-it-euro-map.patch, + files/kbd-1.12-kbd_repeat-v2.patch, +kbd-1.12-r4.ebuild: + Add patch by Tupone Alfredo for italian maps to support the euro #75970. *kbd-1.12-r3 (26 Oct 2004) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 69397f27589b..7868a2b4a3e8 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,21 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 10cd4cf8b9787c24ddfcc43de8a231d6 ChangeLog 5980 -MD5 30167daa10662ae7de91710f712ce89a kbd-1.12-r3.ebuild 2199 +MD5 ca9f2399229e7049461105a416c668be ChangeLog 6266 +MD5 2d472508f72264b52b8b0ed4baf6d0f7 kbd-1.12-r4.ebuild 2328 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 b392b9b6ce5edd6e37767cecb3d97187 kbd-1.12-r2.ebuild 1891 -MD5 66f1d8aeb65761d1150262a4c1255274 files/digest-kbd-1.12-r3 118 -MD5 015486b311baa80949762f8091a89d5e files/kbd-1.12-cz-qwerty-map.patch 5293 +MD5 30167daa10662ae7de91710f712ce89a kbd-1.12-r3.ebuild 2199 +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 3e2652f1b8451784488b743b6e0dd556 files/kbd-1.12-find-map-fix.patch 957 MD5 7c826f293d2f1ae5c4de4031c19cd47d files/digest-kbd-1.12-r2 60 MD5 6e007f04a80358ea81b27c80498a4808 files/kbd-1.08-terminal.patch 925 -MD5 3492e6d5769a7bcb8d19dddf46f3a08e files/kbd-1.12-kbd_repeat-v2.patch 756 +MD5 58617e4171ee3357153c9793be062524 files/kbd-1.12-it-euro-map.patch 501 +MD5 5f28051ad309ee4e481ef3b2b9cc9714 files/kbd-1.12-kbd_repeat-v2.patch 809 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFB0xNVroRuSHgZdywRAqa6AJ0eiR2SfbRVZn6/kG7zGM7yuM3itQCdEney -IBx3+meAjtlcQMIqGNFN4ds= -=UYNA +iD8DBQFB0xZlroRuSHgZdywRAuhkAJ0ZK4NDNqP78P++iPdSLWQM3/+S9ACfVxXX +CAMzMJOeBKpGnfqvOFg3Ya0= +=pkuV -----END PGP SIGNATURE----- diff --git a/sys-apps/kbd/files/digest-kbd-1.12-r4 b/sys-apps/kbd/files/digest-kbd-1.12-r4 new file mode 100644 index 000000000000..97dbb48e0136 --- /dev/null +++ b/sys-apps/kbd/files/digest-kbd-1.12-r4 @@ -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 index 8723b59e5999..a27c88a356f4 100644 --- a/sys-apps/kbd/files/kbd-1.12-cz-qwerty-map.patch +++ b/sys-apps/kbd/files/kbd-1.12-cz-qwerty-map.patch @@ -1,3 +1,16 @@ +kavol@email.cz writes: + +I wanted to use the keymap file /usr/share/keymaps/i386/qwerty/cz.map.gz, +but I have found this to be qwertz so I think it should be placed in +/usr/share/keymaps/i386/qwertz/ (or, much better, converted to qwerty - +I don't understand the masochists who use us-qwerty and cz-qwertz together :-) + +http://bugs.gentoo.org/show_bug.cgi?id=19010 + +Gentoo notes: +We copy the qwerty/cz.map to qwertz/cz.map and then apply this patch ... +that way we end up with both a qwerty and qwertz version of the cz.map + --- 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 @@ diff --git a/sys-apps/kbd/files/kbd-1.12-it-euro-map.patch b/sys-apps/kbd/files/kbd-1.12-it-euro-map.patch new file mode 100644 index 000000000000..bf426518209c --- /dev/null +++ b/sys-apps/kbd/files/kbd-1.12-it-euro-map.patch @@ -0,0 +1,18 @@ +Tupone Alfredo writes: + +To make euro key work at console (not X) I had to modify the +it.map.gz to include euro. + +http://bugs.gentoo.org/show_bug.cgi?id=75970 + +--- data/keymaps/i386/qwerty/it.map.orig 2004-12-29 15:31:59.269844456 -0500 ++++ data/keymaps/i386/qwerty/it.map 2004-12-29 15:32:49.049276832 -0500 +@@ -86,7 +86,7 @@ + alt keycode 15 = Meta_Tab + keycode 16 = q + keycode 17 = w +-keycode 18 = e ++keycode 18 = e E euro + keycode 19 = r + keycode 20 = t + keycode 21 = y 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 index bc924b7d2176..3e7f11dc2358 100644 --- a/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch +++ b/sys-apps/kbd/files/kbd-1.12-kbd_repeat-v2.patch @@ -1,3 +1,5 @@ +Linux is nice and changes around core structures :) + --- 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 @@ diff --git a/sys-apps/kbd/kbd-1.12-r4.ebuild b/sys-apps/kbd/kbd-1.12-r4.ebuild new file mode 100644 index 000000000000..70a05eb2cc35 --- /dev/null +++ b/sys-apps/kbd/kbd-1.12-r4.ebuild @@ -0,0 +1,87 @@ +# 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-r4.ebuild,v 1.1 2004/12/29 20:40:44 vapier 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="nls" + +RDEPEND="virtual/libc" +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 - + 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 +} + +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 +} -- 2.26.2