From 08ae534ba313dc365103c5011a0a326543c3dd7d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 19 Dec 2012 16:10:11 +0100
Subject: [PATCH] kbd: update to 1.15.5.

---
 srcpkgs/kbd/kbd-common.template     | 15 ---------------
 srcpkgs/kbd/patches/fix-es.po.patch | 11 -----------
 srcpkgs/kbd/template                | 29 +++++++++++++++++++----------
 3 files changed, 19 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/kbd/kbd-common.template
 delete mode 100644 srcpkgs/kbd/patches/fix-es.po.patch

diff --git a/srcpkgs/kbd/kbd-common.template b/srcpkgs/kbd/kbd-common.template
deleted file mode 100644
index e61e56196a4..00000000000
--- a/srcpkgs/kbd/kbd-common.template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'kbd-common'.
-#
-noarch=yes
-short_desc="${short_desc} -- development files"
-long_desc="${long_desc}
-
- This package contains the keymaps and console fonts."
-
-replaces="kbd<1.15.3_6"
-
-do_install() {
-	for d in consolefonts consoletrans unimaps keymaps; do
-		vmove usr/share/kbd/${d} usr/share/kbd
-	done
-}
diff --git a/srcpkgs/kbd/patches/fix-es.po.patch b/srcpkgs/kbd/patches/fix-es.po.patch
deleted file mode 100644
index a1f9a5cd702..00000000000
--- a/srcpkgs/kbd/patches/fix-es.po.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/es.old	2011-05-14 23:12:49.000000000 +0200
-+++ po/es.po	2011-05-15 21:07:02.120669404 +0200
-@@ -1363,7 +1363,7 @@
- #: src/setfont.c:682
- #, c-format
- msgid "Saved %d-char %dx%d font file on %s\n"
--msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
-+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
- 
- #: src/setkeycodes.c:21
- #, c-format
diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template
index 25019712da2..7b6246b476b 100644
--- a/srcpkgs/kbd/template
+++ b/srcpkgs/kbd/template
@@ -1,28 +1,37 @@
 # Template file for 'kbd'
 pkgname=kbd
-version=1.15.3
-revision=6
+version=1.15.5
+revision=1
 build_style=configure
 configure_args="--prefix=/usr --datadir=/usr/share/kbd
  --localedir=/usr/share/kbd/locale --mandir=/usr/share/man"
-makedepends="flex"
+makedepends="flex pam-devel"
 short_desc="Linux keyboard utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
-distfiles="http://ftp.cc.uoc.gr/mirrors/ftp.kernel.org/pub/linux/utils/kbd/kbd-${version}.tar.bz2"
-checksum=63fafacf72635a064a370d044b75d9134083a5c15629b0b0f2a27b49bc07bbcf
+distfiles="${homepage}/kbd-${version}.tar.gz"
+checksum=e35fa29f690dbbfb721706b2c8edc760c697640904fec65e81194ae8840c5c62
 long_desc="
  This package allows you to set up the Linux console, change the font,
  resize text mode virtual consoles and remap the keyboard."
 
-depends="kbd-common"
-subpackages="kbd-common"
+replaces="kbd-common<1.15.5"
+
+pre_configure() {
+	# Rename keymap files with the same names
+	# this is needed because when only name of keymap is specified
+	# oadkeys loads the first keymap it can find, which is bad
+	# this should be removed when upstream adopts the change
+	mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+	mv data/keymaps/i386/olpc/es{,-olpc}.map
+	mv data/keymaps/i386/olpc/pt{,-olpc}.map
+	mv data/keymaps/i386/dvorak/no{,-dvorak}.map
+	mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+	mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
+}
 
 post_install() {
-	# Remove olpc keymaps, they conflict with qwerty ones!
-	# and who in earth uses olpc anyway??
-	rm -rf ${DESTDIR}/usr/share/kbd/keymaps/i386/olpc
 	# Remove keymaps for sun, amiga and atari.
 	for f in sun amiga atari; do
 		rm -rf ${DESTDIR}/usr/share/kbd/keymaps/${f}