Merge dvorak-se into a split packagesv_dvorak

2 files changed, 31 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a75689..410b066 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,21 @@
 # Generated by makepkg 4.2.1
-# Mon Jun  1 13:54:29 UTC 2015
+# Mon Jun  8 15:02:03 UTC 2015
 pkgbase = sv_dvorak
-	pkgdesc = A Swedish dvorak keyboard layout (Xorg driver)
 	pkgver = 1
 	pkgrel = 3
 	url = http://tlundqvist.org/sv_dvorak/
-	install = sv_dvorak.install
 	arch = any
 	license = GPL
-	depends = xorg-server
 	source = http://tlundqvist.org/sv_dvorak/drivers/se_sv_dvorak_new.xorg
+	source = http://tlundqvist.org/sv_dvorak/drivers/dvorak-se.map
 	md5sums = 1e4a2818c89e60001a1ec2d98911a0a0
+	md5sums = 722e35f7fcbe5e066e51d2971ab21745
+
+pkgname = sv_dvorak-xorg
+	pkgdesc = A Swedish dvorak keyboard layout
+	install = sv_dvorak.install
+	depends = xorg-server
 
-pkgname = sv_dvorak
+pkgname = sv_dvorak-console
+	pkgdesc = A Swedish dvorak keyboard layout
 
diff --git a/PKGBUILD b/PKGBUILD
index eae7236..f2eb15f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,32 @@
-pkgname=sv_dvorak
+# Maintainer: Johannes Löthberg <johannes@kyriasis.com>
+
+pkgbase=sv_dvorak
+pkgname=(sv_dvorak-xorg sv_dvorak-console)
 pkgver=1
 pkgrel=3
 
-pkgdesc="A Swedish dvorak keyboard layout (Xorg driver)"
 url="http://tlundqvist.org/sv_dvorak/"
-arch=(any)
+arch=('any')
 license=('GPL')
 
-depends=('xorg-server')
+source=('http://tlundqvist.org/sv_dvorak/drivers/se_sv_dvorak_new.xorg'
+        'http://tlundqvist.org/sv_dvorak/drivers/dvorak-se.map')
 
-install=sv_dvorak.install
-source=("http://tlundqvist.org/sv_dvorak/drivers/se_sv_dvorak_new.xorg")
+md5sums=('1e4a2818c89e60001a1ec2d98911a0a0'
+         '722e35f7fcbe5e066e51d2971ab21745')
 
-md5sums=('1e4a2818c89e60001a1ec2d98911a0a0')
+package_sv_dvorak-xorg() {
+	pkgdesc="A Swedish dvorak keyboard layout"
+	depends=('xorg-server')
+	install=sv_dvorak.install
 
-package() {
 	install -Dm644 se_sv_dvorak_new.xorg "$pkgdir"/usr/share/X11/xkb/symbols/se_sv_dvorak
 }
+
+package_sv_dvorak-console() {
+	pkgdesc="A Swedish dvorak keyboard layout"
+
+	gzip -f dvorak-se.map
+	mkdir -p "$pkgdir"/usr/share/kbd/keymaps/i386/dvorak/
+	install -Dm644 dvorak-se.map.gz "$pkgdir"/usr/share/kbd/keymaps/i386/dvorak/
+}