kbd: update to 2.0.1.

srcpkgs/kbd-data

@@ -0,0 +1 @@
+kbd

srcpkgs/kbd/patches/fix-keymap-loading-1.15.5.patch

@@ -1,47 +0,0 @@
-commit 7e06e56157e8431d02e1377cdc44230944203d88
-Author: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date:   Tue Dec 11 14:24:44 2012 +0400
-
-    Fix regression in 16117ce6ab
-    
-    Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
-
-diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l
-index c18dcea..f817c78 100644
---- src/loadkeys.analyze.l
-+++ src/loadkeys.analyze.l
-@@ -307,8 +307,10 @@ To                      to|To|TO
- 				char *s = xstrndup(yytext+1, strlen(yytext)-2);
- 				/* use static pathname to store *s ? */
- 				open_include(s);
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 			}
- <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol}	{
- 				yyerror(_("expected filename between quotes"));
-@@ -323,7 +325,7 @@ To                      to|To|TO
- 			}
- {Eol}			{
- 				line_nr++;
--				if (state_ptr > 0) {
-+				while (state_ptr > 0) {
- 					yy_pop_state();
- 					state_ptr--;
- 				}
-@@ -428,8 +430,10 @@ To                      to|To|TO
- 			}
- <STR>\"			{
- 				*p = '\0';
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 				return(STRLITERAL);
- 			}
- .			{

srcpkgs/kbd/template

@@ -1,21 +1,17 @@
 # Template file for 'kbd'
 pkgname=kbd
-version=1.15.5
+version=2.0.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale"
-hostmakedepends="flex"
+hostmakedepends="automake libtool gettext-devel flex pkg-config"
-makedepends="pam-devel"
+makedepends="pam-devel libfl-devel"
 short_desc="Linux keyboard utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-homepage="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
+homepage="http://www.kbd-project.org/"
-distfiles="${homepage}/kbd-${version}.tar.gz"
+distfiles="http://www.kbd-project.org/download/kbd-${version}.tar.xz"
-checksum=e35fa29f690dbbfb721706b2c8edc760c697640904fec65e81194ae8840c5c62
+checksum=55407b79e90ee65cdbaff7d3dafd2b53c4fee3a645788ffb582091074a2254af
-
-if [ "$CROSS_BUILD" ]; then
-	makedepends+=" libfl-devel"
-fi
 
 pre_configure() {
 	# Rename keymap files with the same names
@@ -28,6 +24,10 @@ pre_configure() {
 	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
+
+	sed -e '/^PKG_CHECK_MODULES.*/d' -i configure.ac
+	sed -e 's,tests ,,g' -i Makefile.am
+	autoreconf -fi
 }
 
 post_install() {
@@ -37,9 +37,21 @@ post_install() {
 	done
 }
 
-kbd_package() {
+kbd-data_package() {
-	replaces="kbd-common<1.15.5"
+	short_desc+=" - keymaps, console fonts and unicode maps"
+	replaces="kbd<2.0.1_1"
+	noarch=yes
 	pkg_install() {
-		vmove usr
+		vmove usr/share/kbd/consolefonts
+		vmove usr/share/kbd/consoletrans
+		vmove usr/share/kbd/keymaps
+		vmove usr/share/kbd/unimaps
+	}
+}
+
+kbd_package() {
+	depends="kbd-data"
+	pkg_install() {
+		vmove all
 	}
 }