From d63975940b1c05a6036b4f90fecf1aa80c8db606 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 7 Mar 2012 00:32:46 +0100
Subject: [PATCH] initramfs-tools: require and update for latest kbd pkg.

---
 srcpkgs/initramfs-tools/files/hooks/keymap | 7 ++++---
 srcpkgs/initramfs-tools/template           | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/initramfs-tools/files/hooks/keymap b/srcpkgs/initramfs-tools/files/hooks/keymap
index e9eb66eb62..d9f03e0e89 100755
--- a/srcpkgs/initramfs-tools/files/hooks/keymap
+++ b/srcpkgs/initramfs-tools/files/hooks/keymap
@@ -20,12 +20,13 @@ if [ "$KEYMAP" != "y" ] && [ "$KEYMAP" != "Y" ]; then
 	exit 0
 fi
 
-[ ! -x ${ROOTDIR}/sbin/loadkeys -a ! -x ${ROOTDIR}/sbin/dumpkeys ] && exit 0
+[ ! -x ${ROOTDIR}/usr/sbin/loadkeys -a ! -x ${ROOTDIR}/usr/sbin/dumpkeys ] && exit 0
 
 . ${ROOTDIR}/usr/share/initramfs-tools/hook-functions
 
-${ROOTDIR}/sbin/dumpkeys > ${DESTDIR}/kmap-tmp
-${ROOTDIR}/sbin/loadkeys -u -b ${DESTDIR}/kmap-tmp > ${DESTDIR}/etc/bkeymap
+${ROOTDIR}/usr/sbin/dumpkeys > ${DESTDIR}/kmap-tmp
+${ROOTDIR}/usr/sbin/loadkeys -u -b ${DESTDIR}/kmap-tmp \
+			> ${DESTDIR}/etc/bkeymap
 rm -f ${DESTDIR}/kmap-tmp
 
 exit 0
diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template
index 252d2159cd..03febfcd72 100644
--- a/srcpkgs/initramfs-tools/template
+++ b/srcpkgs/initramfs-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'initramfs-tools'
 pkgname=initramfs-tools
-_localver=116		# This is the XBPS version
+_localver=117		# This is the XBPS version
 _distver=0.99		# This should match debian version
 version=${_distver}.${_localver}
 short_desc="Tools for generating an initramfs"
@@ -51,10 +51,10 @@ Add_dependency full xz
 Add_dependency full udev
 Add_dependency full busybox	">=1.19.2" # loadkmap
 Add_dependency full klibc-resume
-Add_dependency run module-init-tools	">=3.17"
+Add_dependency full kbd		">=1.15.3_5" # switch to /usr.
+Add_dependency full kmod
 
-do_install()
-{
+do_install() {
 	# /etc config files
 	vinstall $FILESDIR/conf/initramfs.conf 644 etc/$pkgname
 	vinstall $FILESDIR/conf/update-initramfs.conf 644 etc/$pkgname