kbd: update to 2.4.0 and merge kbd-data

srcpkgs/kbd-data

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

srcpkgs/kbd/template

@@ -1,18 +1,18 @@
 # Template file for 'kbd'
 pkgname=kbd
-version=2.3.0
-revision=2
+version=2.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale"
 hostmakedepends="automake libtool gettext-devel flex pkg-config"
 makedepends="pam-devel"
-depends="kbd-data"
 short_desc="Linux keyboard utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kbd-project.org/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=685056143cb8effd0a1d44b5c391eb50d80dcfd014b1a4d6e2650a28d61cb82a
+checksum=55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f
+replaces="kbd-data>=0"
 
 post_patch() {
 	# Rename keymap files with the same names
@@ -42,14 +42,3 @@ post_install() {
 		rm -rf ${DESTDIR}/usr/share/kbd/keymaps/${f}
 	done
 }
-
-kbd-data_package() {
-	short_desc+=" - keymaps, console fonts and unicode maps"
-	replaces="kbd<2.0.1_1"
-	pkg_install() {
-		vmove usr/share/kbd/consolefonts
-		vmove usr/share/kbd/consoletrans
-		vmove usr/share/kbd/keymaps
-		vmove usr/share/kbd/unimaps
-	}
-}