Fix the Debian patch mangling the unimaps directory.

Package-Manager: portage-2.1.1_pre5-r3

5 files changed, 154 insertions, 5 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 0fae5a2c7553..e4bdf86506d8 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kbd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.45 2006/06/28 15:15:47 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.46 2006/08/24 13:57:25 uberlord Exp $
+
+*kbd-1.12-r8 (24 Aug 2006)
+
+  24 Aug 2006; Roy Marples <uberlord@gentoo.org>
+  +files/kbd-1.12-unimap.patch, +kbd-1.12-r8.ebuild:
+  Fix the Debian patch mangling the unimaps directory.
 
 *kbd-1.12-r7 (28 Jun 2006)
 
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 12f516204fa9..8a5e8aabebd3 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -42,6 +42,10 @@ AUX kbd-1.12-setfont-man.patch 629 RMD160 dba23dfb4a9d263da6bc094a56366371bfc1b9
 MD5 ff84eec635b7a1578ef1284b994f779b files/kbd-1.12-setfont-man.patch 629
 RMD160 dba23dfb4a9d263da6bc094a56366371bfc1b9d2 files/kbd-1.12-setfont-man.patch 629
 SHA256 f81c6f07bddefe8bf1f8e1102f8a8c72e96f632aefa248e71a594ad19d767770 files/kbd-1.12-setfont-man.patch 629
+AUX kbd-1.12-unimap.patch 642 RMD160 a8ae481be1e2ca64a2ddc73f03fda644436f76a2 SHA1 9cf44c9ed07da02f5ba9a0dce9df4278e8a4beaa SHA256 f1364a306636661ebcca73d91ca179be811b6b4ccd08b1b761a0847f579623a0
+MD5 3ecd08fb65ebe8d99203b59013e3851a files/kbd-1.12-unimap.patch 642
+RMD160 a8ae481be1e2ca64a2ddc73f03fda644436f76a2 files/kbd-1.12-unimap.patch 642
+SHA256 f1364a306636661ebcca73d91ca179be811b6b4ccd08b1b761a0847f579623a0 files/kbd-1.12-unimap.patch 642
 AUX kbd-1.12-xcompile.patch 611 RMD160 c5f343cb4572048c8c1454b1dd972275b22d61d8 SHA1 b095898a2b57d4dd8f9a5926ca7c738ba4f1a4ae SHA256 7e60332adb2d01e9fed335c81bda789444da5a01ca928b759e5a1becde63dbc8
 MD5 8e339f8d8608e3ff38156007e44fa104 files/kbd-1.12-xcompile.patch 611
 RMD160 c5f343cb4572048c8c1454b1dd972275b22d61d8 files/kbd-1.12-xcompile.patch 611
@@ -60,10 +64,14 @@ EBUILD kbd-1.12-r7.ebuild 2987 RMD160 9551f48acd8aa9a2e60d5037b894ac4118039c17 S
 MD5 cc718d678cde7e0dc0df534262978af4 kbd-1.12-r7.ebuild 2987
 RMD160 9551f48acd8aa9a2e60d5037b894ac4118039c17 kbd-1.12-r7.ebuild 2987
 SHA256 75bfabf8b80fdcef9f39ebac369f2e617652e617f5137291c42c0e25b3131fd3 kbd-1.12-r7.ebuild 2987
-MISC ChangeLog 7823 RMD160 f79b1d516d7815f448105bf486a99dbc584f58b8 SHA1 99945b01076785d6c964338bfedfdb3a9891e51f SHA256 a4dfaeb09931d4628bceb782d2a39ff966ec0c8b3a17f6ed5f134a3ff8162c31
-MD5 035ad40a9d776f54a82a12bb1296be55 ChangeLog 7823
-RMD160 f79b1d516d7815f448105bf486a99dbc584f58b8 ChangeLog 7823
-SHA256 a4dfaeb09931d4628bceb782d2a39ff966ec0c8b3a17f6ed5f134a3ff8162c31 ChangeLog 7823
+EBUILD kbd-1.12-r8.ebuild 3079 RMD160 24936269682f315a20e8bd19f8f4ad67ca4e22fb SHA1 fa4cda957a0fa441f7735b8a2b898960feb5810e SHA256 cc2186ab3a1662129c9852bf366519b50af7ebcf0a2f20422a3bc08955251c42
+MD5 ad227577ecf61627325d8e61615041f7 kbd-1.12-r8.ebuild 3079
+RMD160 24936269682f315a20e8bd19f8f4ad67ca4e22fb kbd-1.12-r8.ebuild 3079
+SHA256 cc2186ab3a1662129c9852bf366519b50af7ebcf0a2f20422a3bc08955251c42 kbd-1.12-r8.ebuild 3079
+MISC ChangeLog 8012 RMD160 62d30f2433ae731cc7a806830b4608e5a3b89bfa SHA1 764585604d5d099fa8c640a2b043c8ebb0118d34 SHA256 fbeed8ae2fa6fad4b2fa9e7f8145a614a4b4d9bfaf6fb9b37bf90ea3a7ab1ea3
+MD5 39c83b2aead49d103c03898cb81a504a ChangeLog 8012
+RMD160 62d30f2433ae731cc7a806830b4608e5a3b89bfa ChangeLog 8012
+SHA256 fbeed8ae2fa6fad4b2fa9e7f8145a614a4b4d9bfaf6fb9b37bf90ea3a7ab1ea3 ChangeLog 8012
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -77,3 +85,6 @@ SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/di
 MD5 ec4cf1768e4c3664ae99adcd221bf6a2 files/digest-kbd-1.12-r7 446
 RMD160 86795682ee0121c2612eb316b4e9ece5bc011889 files/digest-kbd-1.12-r7 446
 SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/digest-kbd-1.12-r7 446
+MD5 ec4cf1768e4c3664ae99adcd221bf6a2 files/digest-kbd-1.12-r8 446
+RMD160 86795682ee0121c2612eb316b4e9ece5bc011889 files/digest-kbd-1.12-r8 446
+SHA256 f7e943b7469a6fe1f17a7784aae1b6f00ec49fcdab2263648343ec32728aa4fb files/digest-kbd-1.12-r8 446
diff --git a/sys-apps/kbd/files/digest-kbd-1.12-r8 b/sys-apps/kbd/files/digest-kbd-1.12-r8
new file mode 100644
index 000000000000..7bbb85a86bcb
--- /dev/null
+++ b/sys-apps/kbd/files/digest-kbd-1.12-r8
@@ -0,0 +1,6 @@
+MD5 7892c7010512a9bc6697a295c921da25 kbd-1.12.tar.gz 884827
+RMD160 260ed9b79b5a679730fc16f1d3ce9360f4ad63fd kbd-1.12.tar.gz 884827
+SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803 kbd-1.12.tar.gz 884827
+MD5 c3bc810b784880c9bb5a6fe80d95a696 svorakln.tar.gz 3030
+RMD160 4ee5d1bdab312eb33cbde9195e6d4cdf28eb9a6e svorakln.tar.gz 3030
+SHA256 7c4015dcd1f4310ba1b872c9a9e57c43d45da822330853ae465e628d3bca8ee3 svorakln.tar.gz 3030
diff --git a/sys-apps/kbd/files/kbd-1.12-unimap.patch b/sys-apps/kbd/files/kbd-1.12-unimap.patch
new file mode 100644
index 000000000000..c7ea73cca656
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-unimap.patch
@@ -0,0 +1,16 @@
+That silly Debian patch changes the default dir to TRANSDIR.
+This patch corrects that oversight so both work if we ever
+use console-data, also by Debian.
+
+--- kbd-1.12/src/loadunimap.c.orig	2006-08-24 13:48:11.000000000 +0100
++++ kbd-1.12/src/loadunimap.c	2006-08-24 13:49:07.000000000 +0100
+@@ -28,7 +28,7 @@
+ extern char *progname;
+ extern int force;
+ 
+-static char *unidirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };
+-static char *unisuffixes[] = { "", ".sfm", ".uni", 0 };
++static char *unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", DATADIR "/" TRANSDIR "/", 0 };
++static char *unisuffixes[] = { "", ".uni", ".sfm", 0 };
+
+ #ifdef MAIN
diff --git a/sys-apps/kbd/kbd-1.12-r8.ebuild b/sys-apps/kbd/kbd-1.12-r8.ebuild
new file mode 100644
index 000000000000..7ca69f3a8e51
--- /dev/null
+++ b/sys-apps/kbd/kbd-1.12-r8.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r8.ebuild,v 1.1 2006/08/24 13:57:25 uberlord 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND=""
+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 -
+		assert
+	done
+
+	cd "${S}"
+	sed -i \
+		-e "/^CFLAGS/ s:-O2:${CFLAGS}:g" \
+		-e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
+		-e "s:install -s:install:" \
+		src/Makefile.in \
+		openvt/Makefile
+
+	if tc-is-cross-compiler; then
+		tc-export CC
+		# Cross-compiling: don't run test programs
+		sed -i -e "s:&& ./conftest::" configure || \
+			die "Could not do sed configure for cross-compile"
+	fi
+
+	# Other patches from RH
+	epatch "${FILESDIR}"/${PN}-1.08-terminal.patch
+
+	epatch "${FILESDIR}"/${P}-configure-LANG.patch #128253
+
+	# 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
+
+	# fix unimap path issue caused by Debian patch
+	epatch "${FILESDIR}/${P}"-unimap.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
+
+	# Fix jp map to recognize Ctrl-[ as Escape #71870
+	epatch "${FILESDIR}"/${P}-jp-escape.patch
+
+	# Patches from Fedora
+	epatch "${FILESDIR}"/${P}-Meta_utf8.patch
+	## Fix runtime with gcc4 (setfont: Input file: trailing garbage)
+	epatch "${FILESDIR}"/${P}-alias.patch
+	epatch "${FILESDIR}"/${P}-setfont-man.patch
+
+	# cross-compile fails for powerpc targets bug #133856
+	epatch "${FILESDIR}"/${P}-xcompile.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
+}