From 44424567c580132589c9020c4406478993f2cf65 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Thu, 4 Jun 2020 18:18:09 -0500
Subject: system/*: move consolefont & keymaps services from openrc to kbd

---
 system/kbd/APKBUILD | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

(limited to 'system/kbd/APKBUILD')

diff --git a/system/kbd/APKBUILD b/system/kbd/APKBUILD
index d54e7f29c..deb7fb205 100644
--- a/system/kbd/APKBUILD
+++ b/system/kbd/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kbd
 pkgver=2.2.0_git20190823
-pkgrel=0
+pkgrel=1
 pkgdesc="Console keyboard and font management utilities"
-url=" "
+url="https://kbd-project.org/"
 arch="all"
 options="!check"  # padding error on at least ppc64
 license="GPL-2.0+"
@@ -12,8 +12,13 @@ depends=""
 checkdepends="check-dev"
 makedepends="linux-headers linux-pam-dev autoconf automake libtool"
 subpackages="$pkgname-doc $pkgname-fonts::noarch $pkgname-keymaps::noarch
-	$pkgname-lang"
-source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.xz"
+	$pkgname-lang $pkgname-openrc"
+source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.xz
+	consolefont.confd
+	consolefont.initd
+	keymaps.confd
+	keymaps.initd
+	"
 
 prepare() {
 	default_prepare
@@ -37,6 +42,19 @@ check() {
 
 package() {
 	make DESTDIR="$pkgdir" install
+
+	for i in consolefont keymaps; do
+		install -Dm644 "$srcdir"/$i.confd \
+			"$pkgdir"/etc/conf.d/$i
+		install -Dm755 "$srcdir"/$i.initd \
+			"$pkgdir"/etc/init.d/$i
+	done
+}
+
+openrc() {
+	default_openrc
+	license="BSD-2-Clause"
+	replaces="openrc<0.24.1-r10"
 }
 
 fonts() {
@@ -52,4 +70,8 @@ keymaps() {
 	mv "$pkgdir"/usr/share/unimaps "$subpkgdir"/usr/share/
 }
 
-sha512sums="7f6202aeb17d6224095447a92d999478220457e1e7cadb90a7c40ca7f3b0c5b1f672db1995fb69652ca37558a75df582bfb5fea5772f3b1e040fe39f8f54504e  kbd-2.2.0_git20190823.tar.xz"
+sha512sums="7f6202aeb17d6224095447a92d999478220457e1e7cadb90a7c40ca7f3b0c5b1f672db1995fb69652ca37558a75df582bfb5fea5772f3b1e040fe39f8f54504e  kbd-2.2.0_git20190823.tar.xz
+19761fdd2b32c1bbcc9254b89b7893741e144b917a75410af3f274553fe61e2f56cbbd17ff77ac929e9377604663cbbfd9e53c73e7d41e71de6de573730950c7  consolefont.confd
+1e67f75f27ec5de8f71489c83f78e53e8fd0925ae2d82dabf516f98905c5aff206a8e943e92b6af413eae5f0ecb9c2240526dfc3c56811a8dc1d19ced561bba3  consolefont.initd
+af7d37fc6be1382414ca8245ca6f8d2ee8b82650b8a08eebbd980cf6dd2b92524fce2851ce0b2cd67e915488c12044ab50c5ab1f01c3072af87eed3e058ac268  keymaps.confd
+510d7eb582a914fa7cfb868d0c3d55a21ee1519033117d0943a153528b5810d09f6421ddc02d93906c1a66fb7e07e86240f38dad0d38cfb5a8c7e9a6335a937f  keymaps.initd"
-- 
cgit v1.2.3-70-g09d2