# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1337981210 -7200
# Node ID f6382af837a646101b4e3d7971710359d30175f1
# Parent  4d4b18813d25d2ccec3980e0c8a1e421887d5422
Add kbd to ARM

diff -r 4d4b18813d25 -r f6382af837a6 kbd-base/receipt
--- a/kbd-base/receipt	Fri May 25 23:24:13 2012 +0200
+++ b/kbd-base/receipt	Fri May 25 23:26:50 2012 +0200
@@ -6,30 +6,34 @@
 SHORT_DESC="Keyboard maping definitions and loadkeys utility."
 MAINTAINER="pankso@slitaz.org"
 WANTED="kbd"
-WEB_SITE="http://www.kernel.org/pub/linux/utils/kbd/"
+WEB_SITE="http://kbd-project.org/"
+HOST_ARCH="i486 arm"
+
+# Make sure it will run on host or no keyboard support...
+testsuite()
+{
+	readelf -h $install/usr/bin/loadkeys
+}
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p \
-		$fs/usr/share/kbd/keymaps/i386/azerty \
-		$fs/usr/share/kbd/keymaps/i386/dvorak \
-		$fs/usr/share/kbd/keymaps/i386/qwerty \
-		$fs/usr/share/kbd/keymaps/i386/qwertz \
-		$fs/bin
-		
-	cp -a $_pkg/usr/bin/loadkeys $fs/bin
-	
+	mkdir -p $fs/bin
+	cp -a $install/usr/bin/loadkeys $fs/bin
+	# Dirs
+	for dir in dvorak azerty qwerty qwertz; do
+		mkdir -p $fs/usr/share/kbd/keymaps/i386/$dir
+	done
 	# i386 keymaps only.
-	for keymap in `cat $stuff/keymaps-path.list`
+	for keymap in $(cat $stuff/keymaps-path.list)
 	do
-		cp -a $_pkg/usr/share/kbd/keymaps/i386/$keymap \
+		cp -a $install/usr/share/kbd/keymaps/i386/$keymap \
 			$fs/usr/share/kbd/keymaps/i386/$keymap
 	done
 	# Include files
-	cp -a $_pkg/usr/share/kbd/keymaps/include \
+	cp -a $install/usr/share/kbd/keymaps/include \
 		$fs/usr/share/kbd/keymaps
-	cp -a $_pkg/usr/share/kbd/keymaps/i386/include \
+	cp -a $install/usr/share/kbd/keymaps/i386/include \
 		$fs/usr/share/kbd/keymaps/i386/include
 }
 
diff -r 4d4b18813d25 -r f6382af837a6 kbd/receipt
--- a/kbd/receipt	Fri May 25 23:24:13 2012 +0200
+++ b/kbd/receipt	Fri May 25 23:26:50 2012 +0200
@@ -4,52 +4,55 @@
 VERSION="1.15.3"
 CATEGORY="system-tools"
 SHORT_DESC="Keyboard maping definitions and tools."
-BUILD_DEPENDS="flex"
 MAINTAINER="pankso@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.kernel.org/pub/linux/utils/kbd/"
-WGET_URL="http://www.kernel.org/pub/linux/utils/kbd/$TARBALL"
+WEB_SITE="http://kbd-project.org/"
+WGET_URL="http://kbd-project.org/download/$TARBALL"
 TAGS="keyboard"
+HOST_ARCH="i486 arm"
+
+#BUILD_DEPENDS="flex"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
 	patch -Np1 -i $stuff/fix-es.po.patch
-	./configure --datadir=/usr/share/kbd $CONFIGURE_ARGS &&
-	make &&
-	make install
+	./configure \
+		--datadir=/usr/share/kbd \
+		$CONFIGURE_ARGS &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share
-	
-	# Copy all kbd files (should we split fonts ?) and remove the one 
+
+	# Copy all kbd files (should we split fonts ?) and remove the one
 	# provided by: kbd-base.
 	cp -a $_pkg/usr/share/kbd $fs/usr/share
 	rm -rf $fs/usr/share/kbd/keymaps/i386
-	
+
 	# Tools
-	cp -a $_pkg/usr/bin $fs/usr
+	cp -a $install/usr/bin $fs/usr
 }
 
 # Overlap busybox
 pre_install()
 {
-	rm -f $1/usr/bin/deallocvt
-	rm -f $1/usr/bin/chvt
-	rm -f $1/usr/bin/setkeycodes
-	rm -f $1/usr/bin/openvt
-	rm -f $1/usr/bin/kbd_mode
+	rm -f $root/usr/bin/deallocvt
+	rm -f $root/usr/bin/chvt
+	rm -f $root/usr/bin/setkeycodes
+	rm -f $root/usr/bin/openvt
+	rm -f $root/usr/bin/kbd_mode
 }
 
 post_remove()
 {
-	ln -s /bin/busybox $1/usr/bin/deallocvt
-	ln -s /bin/busybox $1/usr/bin/chvt
-	ln -s /bin/busybox $1/usr/bin/setkeycodes
-	ln -s /bin/busybox $1/usr/bin/openvt
-	ln -s /bin/busybox $1/usr/bin/kbd_mode
+	ln -s /bin/busybox $root/usr/bin/deallocvt
+	ln -s /bin/busybox $root/usr/bin/chvt
+	ln -s /bin/busybox $root/usr/bin/setkeycodes
+	ln -s /bin/busybox $root/usr/bin/openvt
+	ln -s /bin/busybox $root/usr/bin/kbd_mode
 }
diff -r 4d4b18813d25 -r f6382af837a6 slitaz-tools/receipt
--- a/slitaz-tools/receipt	Fri May 25 23:24:13 2012 +0200
+++ b/slitaz-tools/receipt	Fri May 25 23:26:50 2012 +0200
@@ -5,12 +5,23 @@
 CATEGORY="system-tools"
 SHORT_DESC="SliTaz tools provide installer and utils usable on termnial."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="slitaz-boot-scripts dialog gettext-base slitaz-configs-base"
-BUILD_DEPENDS="gettext"
 SUGGESTED="slitaz-tools-boxes"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.slitaz.org/"
 WGET_URL="http://mirror.slitaz.org/sources/tools/$TARBALL"
+HOST_ARCH="i486 arm"
+
+DEPENDS="slitaz-boot-scripts dialog gettext-base slitaz-configs-base"
+BUILD_DEPENDS="gettext"
+
+# Handle multiarch compilation.
+case "$ARCH" in
+	arm)
+		DEPENDS="slitaz-boot-scripts dialog gettext-base"
+		BUILD_DEPENDS="" ;;
+esac
+
+# Saved config file by package manager
 CONFIG_FILES="
 /etc/TZ
 /etc/keymap.conf
@@ -30,33 +41,29 @@
 {
 	mkdir -p $fs
 	cp -a $install/* $fs
-
 	# Makefile bug in 5.0
 	cp -a $src/tinyutils/decode $fs/usr/bin
-
 	chmod 0644 $fs/usr/share/locale/*/*/*.mo
 	chown -R root.root $fs
 }
 
 # Pre install commands.
-pre_install()
-{
- 	local root
- 	root=$1
+#pre_install()
+#{
 	# Backup file to restore with post install
-	echo "Creating backups of configs..."
-	cp $root/etc/TZ $root/etc/TZ.bak 2>/dev/null
-	cp $root/etc/keymap.conf $root/etc/keymap.conf.bak 2>/dev/null
-	cp $root/etc/locale.conf $root/etc/locale.conf.bak 2>/dev/null
-	cp $root/etc/firewall.conf $root/etc/firewall.conf.bak 2>/dev/null
-}
+	#echo "Creating backups of configs..."
+	#cp $root/etc/TZ $root/etc/TZ.bak 2>/dev/null
+	#cp $root/etc/keymap.conf $root/etc/keymap.conf.bak 2>/dev/null
+	#cp $root/etc/locale.conf $root/etc/locale.conf.bak 2>/dev/null
+	#cp $root/etc/firewall.conf $root/etc/firewall.conf.bak 2>/dev/null
+#}
 
 # Post install
-post_install()
-{
-	echo "Restoring configs backups..."
-	mv -f $root/etc/TZ.bak $root/etc/TZ 2>/dev/null
-	mv -f $root/etc/keymap.conf.bak $root/etc/keymap.conf 2>/dev/null
-	mv -f $root/etc/locale.conf.bak $root/etc/locale.conf 2>/dev/null
-	mv -f $root/etc/firewall.conf.bak $root/etc/firewall.conf 2>/dev/null
-}
+#post_install()
+#{
+	#echo "Restoring configs backups..."
+	#mv -f $root/etc/TZ.bak $root/etc/TZ 2>/dev/null
+	#mv -f $root/etc/keymap.conf.bak $root/etc/keymap.conf 2>/dev/null
+	#mv -f $root/etc/locale.conf.bak $root/etc/locale.conf 2>/dev/null
+	#mv -f $root/etc/firewall.conf.bak $root/etc/firewall.conf 2>/dev/null
+#}